diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-02-14 12:32:39 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-02-14 12:32:39 +0000 |
| commit | 6213d5b33cfae99e350488ab96bfd9704e0ff834 (patch) | |
| tree | 05ebefc49a87571e8d2157ee129a669ece83bc57 | |
| parent | 89121f9543123f4f0d339a83025030864e673ec1 (diff) | |
| download | emacs-6213d5b33cfae99e350488ab96bfd9704e0ff834.tar.gz | |
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
| -rw-r--r-- | README.multi-tty | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/README.multi-tty b/README.multi-tty index 59bca5007d5..49a3f7b92bf 100644 --- a/README.multi-tty +++ b/README.multi-tty @@ -402,9 +402,9 @@ is probably not very interesting for anyone else.) THINGS TO DO ------------ -** emacsclient -t on the console does not work after sudo: +** emacsclient -t on the console does not work after su: - # sudo lorentey + # su lorentey $ emacsclient -t *ERROR*: Could not open file: /dev/tty1 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'. */) return Qnil; tty = t->display_info.tty; + if (NILP (quit) || !INTEGERP (quit) || XINT (quit) < 0 || XINT (quit) > 0400) + error ("QUIT must be an ASCII character"); + #ifndef DOS_NT /* this causes startup screen to be restored and messes with the mouse */ reset_sys_modes (tty); #endif - if (NILP (quit) || !INTEGERP (quit) || XINT (quit) < 0 || XINT (quit) > 0400) - error ("QUIT must be an ASCII character"); - /* Don't let this value be out of range. */ quit_char = XINT (quit) & (tty->meta_key == 0 ? 0177 : 0377); |