diff options
| author | Eli Zaretskii | 2012-11-13 16:17:18 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-13 16:17:18 +0200 |
| commit | 3c4ca7155293ffc2d04708007131bcbc882d8913 (patch) | |
| tree | 61787be8cd43b6fb3d5159852fbd186eea404de7 /src/sysdep.c | |
| parent | 5ade42a5114255c43117065494b96d480c1e1588 (diff) | |
| parent | c708524567662c8911c5ab2695acc7bda0383705 (diff) | |
| download | emacs-3c4ca7155293ffc2d04708007131bcbc882d8913.tar.gz emacs-3c4ca7155293ffc2d04708007131bcbc882d8913.zip | |
Merge from trunk.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 63eac5d9e09..aa9d0f38c3c 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -452,7 +452,7 @@ sys_suspend (void) | |||
| 452 | #if defined (SIGTSTP) && !defined (MSDOS) | 452 | #if defined (SIGTSTP) && !defined (MSDOS) |
| 453 | 453 | ||
| 454 | { | 454 | { |
| 455 | pid_t pgrp = EMACS_GETPGRP (0); | 455 | pid_t pgrp = getpgrp (); |
| 456 | EMACS_KILLPG (pgrp, SIGTSTP); | 456 | EMACS_KILLPG (pgrp, SIGTSTP); |
| 457 | } | 457 | } |
| 458 | 458 | ||
| @@ -709,7 +709,7 @@ static pid_t inherited_pgroup; | |||
| 709 | void | 709 | void |
| 710 | init_foreground_group (void) | 710 | init_foreground_group (void) |
| 711 | { | 711 | { |
| 712 | pid_t pgrp = EMACS_GETPGRP (0); | 712 | pid_t pgrp = getpgrp (); |
| 713 | inherited_pgroup = getpid () == pgrp ? 0 : pgrp; | 713 | inherited_pgroup = getpid () == pgrp ? 0 : pgrp; |
| 714 | } | 714 | } |
| 715 | 715 | ||