diff options
| author | Karoly Lorentey | 2004-01-02 02:54:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-01-02 02:54:17 +0000 |
| commit | 7b00d185eba8e01f191a69740e3270c88f88159c (patch) | |
| tree | 1bddf818e98404035261883f3cbfc5e4c80f40bf /lib-src | |
| parent | daf0170133e658c41f3ae2fc8558c5ab74227c1d (diff) | |
| download | emacs-7b00d185eba8e01f191a69740e3270c88f88159c.tar.gz emacs-7b00d185eba8e01f191a69740e3270c88f88159c.zip | |
MULTI_KBOARD support for ttys. Input-related bugfixes for X+tty sessions.
lib-src/emacsclient.c (pty_conversation): Fix errno check for read from fileno(in).
src/config.in: Unconditionally define MULTI_KBOARD.
src/frame.c (make_terminal_frame): Initialize f->kboard.
src/keyboard.c (cmd_error_internal): Don't kill Emacs if a Quit was
pressed on the tty of a X+tty session.
(read_avail_input): Initialize nread to zero. Abort if there is no
tty after a termcap read.
(interrupt_signal)[USG]: Always reset signal handler.
(init_keyboard): Always set signal handler for SIGINT/SIGQUIT if
noninteractive.
src/term.c (term_dummy_init): Initialize kboard to the initial_kboard.
(term_init): Free component structures of the initial tty. Clear xmalloced structures.
Moved rif initialization to syms_of_term.
(term_init)[MULTI_KBOARD]: Initialize tty->kboard.
(delete_tty)[MULTI_KBOARD]: Delete the keyboard.
(syms_of_term): Initialize tty_display_method_template.
src/termchar.h (tty_output)[MULTI_KBOARD]: Added kboard member.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-31
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 4d0a4462578..6f75bbd04fd 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -794,7 +794,7 @@ pty_conversation (FILE *in) | |||
| 794 | { | 794 | { |
| 795 | do { | 795 | do { |
| 796 | res = read (fileno (in), string, BUFSIZ-1); | 796 | res = read (fileno (in), string, BUFSIZ-1); |
| 797 | } while (res == EINTR); | 797 | } while (res < 0 && errno == EINTR); |
| 798 | if (res < 0) | 798 | if (res < 0) |
| 799 | { | 799 | { |
| 800 | reset_tty (); | 800 | reset_tty (); |