diff options
| author | Karoly Lorentey | 2004-01-09 13:12:28 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-01-09 13:12:28 +0000 |
| commit | 08c8c725b26298d9d4fb035b4c456f10ac6adc1b (patch) | |
| tree | 88b4cbfa773795cba7243d5e96e51ebd90849abf /src | |
| parent | 12e1ee02b6f80a3e06f3ffb98f85e2023102f1e8 (diff) | |
| download | emacs-08c8c725b26298d9d4fb035b4c456f10ac6adc1b.tar.gz emacs-08c8c725b26298d9d4fb035b4c456f10ac6adc1b.zip | |
Fix SEGV in init_sys_modes during X startup
src/keyboard.c (Fset_input_mode): Don't call {init,reset}_sig_modes if
the tty is the initial tty.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-47
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index ff62a07c25f..fdd0447a649 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -10463,7 +10463,7 @@ See also `current-input-mode'. */) | |||
| 10463 | 10463 | ||
| 10464 | #ifndef DOS_NT | 10464 | #ifndef DOS_NT |
| 10465 | /* this causes startup screen to be restored and messes with the mouse */ | 10465 | /* this causes startup screen to be restored and messes with the mouse */ |
| 10466 | if (FRAME_TERMCAP_P (SELECTED_FRAME ())) | 10466 | if (FRAME_TERMCAP_P (SELECTED_FRAME ()) && CURTTY ()->type) |
| 10467 | reset_sys_modes (CURTTY ()); | 10467 | reset_sys_modes (CURTTY ()); |
| 10468 | #endif | 10468 | #endif |
| 10469 | 10469 | ||
| @@ -10507,7 +10507,7 @@ See also `current-input-mode'. */) | |||
| 10507 | quit_char = XINT (quit) & (CURTTY ()->meta_key ? 0377 : 0177); | 10507 | quit_char = XINT (quit) & (CURTTY ()->meta_key ? 0377 : 0177); |
| 10508 | 10508 | ||
| 10509 | #ifndef DOS_NT | 10509 | #ifndef DOS_NT |
| 10510 | if (FRAME_TERMCAP_P (XFRAME (selected_frame))) | 10510 | if (FRAME_TERMCAP_P (XFRAME (selected_frame)) && CURTTY ()->type) |
| 10511 | init_sys_modes (CURTTY ()); | 10511 | init_sys_modes (CURTTY ()); |
| 10512 | #endif | 10512 | #endif |
| 10513 | 10513 | ||