File tree 2 files changed +6
-8
lines changed
2 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -4837,15 +4837,13 @@ void
4837
4837
end_job_control ()
4838
4838
{
4839
4839
if (job_control )
4840
- {
4841
- terminate_stopped_jobs ();
4840
+ terminate_stopped_jobs ();
4842
4841
4843
- if (original_pgrp >= 0 )
4844
- give_terminal_to (original_pgrp , 1 );
4845
- }
4842
+ if (original_pgrp >= 0 && terminal_pgrp != original_pgrp )
4843
+ give_terminal_to (original_pgrp , 1 );
4846
4844
4847
- if (original_pgrp >= 0 )
4848
- setpgid ( 0 , original_pgrp ) ;
4845
+ if (original_pgrp >= 0 && setpgid ( 0 , original_pgrp ) == 0 )
4846
+ shell_pgrp = original_pgrp ;
4849
4847
}
4850
4848
4851
4849
/* Restart job control by closing shell tty and reinitializing. This is
Original file line number Diff line number Diff line change 25
25
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
26
26
looks for to find the patch level (for the sccs version string). */
27
27
28
- #define PATCHLEVEL 6
28
+ #define PATCHLEVEL 7
29
29
30
30
#endif /* _PATCHLEVEL_H_ */
You can’t perform that action at this time.
0 commit comments