diff options
| author | Karoly Lorentey | 2004-01-11 02:45:44 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-01-11 02:45:44 +0000 |
| commit | 4ca927b4e0eb688a0eb224463288443164dd716f (patch) | |
| tree | 07e786aa4aba5640b38a872163b8960c86368d92 /src/term.c | |
| parent | 8f1ce42333b410e736053a7c5cbbf102032c84f2 (diff) | |
| download | emacs-4ca927b4e0eb688a0eb224463288443164dd716f.tar.gz emacs-4ca927b4e0eb688a0eb224463288443164dd716f.zip | |
Fix C-g handling with multiple ttys.
src/sysdep.c (init_sys_modes): Disable interrupt and quit keys on
secondary terminals. Added a big fat comment about this.
lib-src/emacsclient.c (init_signals): Don't pass SIGINT and SIGQUIT to Emacs.
src/keyboard.c (interrupt_signal): Exit Emacs if there are no frames
on the controlling tty. Otherwise set internal_last_event_frame to
the controlling tty's top frame.
src/term.c (ring_bell, tty_ring_bell): Don't look at updating_frame.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-52
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/term.c b/src/term.c index a988b7d92e8..3ab02c501b8 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -176,9 +176,7 @@ extern char *tgetstr (); | |||
| 176 | void | 176 | void |
| 177 | ring_bell () | 177 | ring_bell () |
| 178 | { | 178 | { |
| 179 | struct frame *f = (updating_frame | 179 | struct frame *f = XFRAME (selected_frame); |
| 180 | ? updating_frame | ||
| 181 | : XFRAME (selected_frame)); | ||
| 182 | 180 | ||
| 183 | if (!NILP (Vring_bell_function)) | 181 | if (!NILP (Vring_bell_function)) |
| 184 | { | 182 | { |
| @@ -206,10 +204,7 @@ ring_bell () | |||
| 206 | void | 204 | void |
| 207 | tty_ring_bell () | 205 | tty_ring_bell () |
| 208 | { | 206 | { |
| 209 | struct frame *f = (updating_frame | 207 | struct frame *f = XFRAME (selected_frame); |
| 210 | ? updating_frame | ||
| 211 | : XFRAME (selected_frame)); | ||
| 212 | |||
| 213 | struct tty_display_info *tty = FRAME_TTY (f); | 208 | struct tty_display_info *tty = FRAME_TTY (f); |
| 214 | 209 | ||
| 215 | OUTPUT (tty, (tty->TS_visible_bell && visible_bell | 210 | OUTPUT (tty, (tty->TS_visible_bell && visible_bell |