diff options
| author | Karoly Lorentey | 2006-02-14 12:32:39 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-02-14 12:32:39 +0000 |
| commit | 6213d5b33cfae99e350488ab96bfd9704e0ff834 (patch) | |
| tree | 05ebefc49a87571e8d2157ee129a669ece83bc57 /src | |
| parent | 89121f9543123f4f0d339a83025030864e673ec1 (diff) | |
| download | emacs-6213d5b33cfae99e350488ab96bfd9704e0ff834.tar.gz emacs-6213d5b33cfae99e350488ab96bfd9704e0ff834.zip | |
Fix tty state problem after error in `set-quit-char'.
* src/keyboard.c (Fset_quit_char): Don't leave tty state uninitialized
after an error.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-512
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 319e6d24974..c393e676e2d 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -10909,14 +10909,14 @@ See also `current-input-mode'. */) | |||
| 10909 | return Qnil; | 10909 | return Qnil; |
| 10910 | tty = t->display_info.tty; | 10910 | tty = t->display_info.tty; |
| 10911 | 10911 | ||
| 10912 | if (NILP (quit) || !INTEGERP (quit) || XINT (quit) < 0 || XINT (quit) > 0400) | ||
| 10913 | error ("QUIT must be an ASCII character"); | ||
| 10914 | |||
| 10912 | #ifndef DOS_NT | 10915 | #ifndef DOS_NT |
| 10913 | /* this causes startup screen to be restored and messes with the mouse */ | 10916 | /* this causes startup screen to be restored and messes with the mouse */ |
| 10914 | reset_sys_modes (tty); | 10917 | reset_sys_modes (tty); |
| 10915 | #endif | 10918 | #endif |
| 10916 | 10919 | ||
| 10917 | if (NILP (quit) || !INTEGERP (quit) || XINT (quit) < 0 || XINT (quit) > 0400) | ||
| 10918 | error ("QUIT must be an ASCII character"); | ||
| 10919 | |||
| 10920 | /* Don't let this value be out of range. */ | 10920 | /* Don't let this value be out of range. */ |
| 10921 | quit_char = XINT (quit) & (tty->meta_key == 0 ? 0177 : 0377); | 10921 | quit_char = XINT (quit) & (tty->meta_key == 0 ? 0177 : 0377); |
| 10922 | 10922 | ||