diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/sysdep.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.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 9b4bd088046..bd8a1020441 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -433,7 +433,7 @@ child_setup_tty (int out) | |||
| 433 | #endif /* AIX */ | 433 | #endif /* AIX */ |
| 434 | 434 | ||
| 435 | /* We originally enabled ICANON (and set VEOF to 04), and then had | 435 | /* We originally enabled ICANON (and set VEOF to 04), and then had |
| 436 | proces.c send additional EOF chars to flush the output when faced | 436 | process.c send additional EOF chars to flush the output when faced |
| 437 | with long lines, but this leads to weird effects when the | 437 | with long lines, but this leads to weird effects when the |
| 438 | subprocess has disabled ICANON and ends up seeing those spurious | 438 | subprocess has disabled ICANON and ends up seeing those spurious |
| 439 | extra EOFs. So we don't send EOFs any more in | 439 | extra EOFs. So we don't send EOFs any more in |
| @@ -1663,7 +1663,7 @@ init_signals (void) | |||
| 1663 | sys_siglist[SIGQUIT] = "Quit"; | 1663 | sys_siglist[SIGQUIT] = "Quit"; |
| 1664 | # endif | 1664 | # endif |
| 1665 | # ifdef SIGRETRACT | 1665 | # ifdef SIGRETRACT |
| 1666 | sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode"; | 1666 | sys_siglist[SIGRETRACT] = "Need to relinquish monitor mode"; |
| 1667 | # endif | 1667 | # endif |
| 1668 | # ifdef SIGSAK | 1668 | # ifdef SIGSAK |
| 1669 | sys_siglist[SIGSAK] = "Secure attention"; | 1669 | sys_siglist[SIGSAK] = "Secure attention"; |