diff options
| author | Jim Blandy | 1992-02-20 04:15:20 +0000 |
|---|---|---|
| committer | Jim Blandy | 1992-02-20 04:15:20 +0000 |
| commit | a41f8bed219bb3f7f4aa438e60532d2789dfb067 (patch) | |
| tree | dcf6739e4e1c129c3f23a74e82bf4707209468c2 /src/emacs.c | |
| parent | 0c29c32c50d121ce39b36209f22dc26f15589eb2 (diff) | |
| download | emacs-a41f8bed219bb3f7f4aa438e60532d2789dfb067.tar.gz emacs-a41f8bed219bb3f7f4aa438e60532d2789dfb067.zip | |
*** empty log message ***
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/emacs.c b/src/emacs.c index d615e7fdf14..b3f17306e4f 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -52,6 +52,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 52 | #include "lisp.h" | 52 | #include "lisp.h" |
| 53 | #include "commands.h" | 53 | #include "commands.h" |
| 54 | 54 | ||
| 55 | #include "systerm.h" | ||
| 56 | |||
| 55 | #ifndef O_RDWR | 57 | #ifndef O_RDWR |
| 56 | #define O_RDWR 2 | 58 | #define O_RDWR 2 |
| 57 | #endif | 59 | #endif |
| @@ -124,15 +126,10 @@ fatal_error_signal (sig) | |||
| 124 | fatal_error_in_progress = 1; | 126 | fatal_error_in_progress = 1; |
| 125 | 127 | ||
| 126 | /* If we are controlling the terminal, reset terminal modes */ | 128 | /* If we are controlling the terminal, reset terminal modes */ |
| 127 | #if defined(TIOCGPGRP) || defined(HAVE_TERMIOS) | 129 | #ifdef EMACS_HAVE_TTY_PGRP |
| 128 | { | 130 | { |
| 129 | int tpgrp; | 131 | int tpgrp; |
| 130 | if ( | 132 | if (EMACS_GET_TTY_PGRP (0, &tpgrp) != -1 |
| 131 | #ifdef HAVE_TERMIOS | ||
| 132 | (tpgrp = tcgetpgrp (0)) != -1 | ||
| 133 | #else | ||
| 134 | ioctl(0, TIOCGPGRP, &tpgrp) == 0 | ||
| 135 | #endif | ||
| 136 | && tpgrp == getpgrp (0)) | 133 | && tpgrp == getpgrp (0)) |
| 137 | { | 134 | { |
| 138 | reset_sys_modes (); | 135 | reset_sys_modes (); |