diff options
| author | Dan Nicolaescu | 2009-06-23 07:09:58 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-06-23 07:09:58 +0000 |
| commit | 2f686c87436120db1131638208d2ac6a718b5c54 (patch) | |
| tree | c95c1f8c512244dee3c8e6250a1f2d65582f160a /src | |
| parent | 666e158e382bca51630b3822a54bf51c52d41d23 (diff) | |
| download | emacs-2f686c87436120db1131638208d2ac6a718b5c54.tar.gz emacs-2f686c87436120db1131638208d2ac6a718b5c54.zip | |
(child_setup_tty): Remove SIGNALS_VIA_CHARACTERS
conditional, it is always defined on AIX.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/sysdep.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1c7e15979f9..680b72bc424 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-06-23 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * sysdep.c (child_setup_tty): Remove SIGNALS_VIA_CHARACTERS | ||
| 4 | conditional, it is always defined on AIX. | ||
| 5 | |||
| 1 | 2009-06-23 Miles Bader <miles@gnu.org> | 6 | 2009-06-23 Miles Bader <miles@gnu.org> |
| 2 | 7 | ||
| 3 | * window.c (Vrecenter_redisplay): New variable. | 8 | * window.c (Vrecenter_redisplay): New variable. |
diff --git a/src/sysdep.c b/src/sysdep.c index 221febd0d7a..028e6e40957 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -578,12 +578,6 @@ child_setup_tty (out) | |||
| 578 | /* rms: Formerly it set s.main.c_cc[VINTR] to 0377 here | 578 | /* rms: Formerly it set s.main.c_cc[VINTR] to 0377 here |
| 579 | unconditionally. Then a SIGNALS_VIA_CHARACTERS conditional | 579 | unconditionally. Then a SIGNALS_VIA_CHARACTERS conditional |
| 580 | would force it to 0377. That looks like duplicated code. */ | 580 | would force it to 0377. That looks like duplicated code. */ |
| 581 | #ifndef SIGNALS_VIA_CHARACTERS | ||
| 582 | /* QUIT and INTR work better as signals, so disable character forms */ | ||
| 583 | s.main.c_cc[VQUIT] = CDISABLE; | ||
| 584 | s.main.c_cc[VINTR] = CDISABLE; | ||
| 585 | s.main.c_lflag &= ~ISIG; | ||
| 586 | #endif /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */ | ||
| 587 | s.main.c_cc[VEOL] = CDISABLE; | 581 | s.main.c_cc[VEOL] = CDISABLE; |
| 588 | s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */ | 582 | s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */ |
| 589 | #endif /* AIX */ | 583 | #endif /* AIX */ |