Mercurial > emacs
changeset 74748:8a37dd687f38
(kbd_buffer_store_event_hold): Undo 2006-12-04 change.
(make_lispy_event): Don't generate Qsignal prefix for code 0.
Abort if signal code is unknown.
(store_user_signal_events): Don't make Qsignal prefix (code 0).
(Qsignal): Move declaration back to process.c.
(syms_of_keyboard): Don't intern or staticpro it here.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 19 Dec 2006 15:37:20 +0000 |
parents | 53804f26b67e |
children | 526fb5e934a5 |
files | src/keyboard.c |
diffstat | 1 files changed, 7 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Tue Dec 19 15:37:13 2006 +0000 +++ b/src/keyboard.c Tue Dec 19 15:37:20 2006 +0000 @@ -3799,8 +3799,7 @@ if (!NILP (Vthrow_on_input) && event->kind != FOCUS_IN_EVENT && event->kind != HELP_EVENT - && event->kind != DEICONIFY_EVENT - && !(event->kind == USER_SIGNAL_EVENT && event->code == 0)) + && event->kind != DEICONIFY_EVENT) { Vquit_flag = Vthrow_on_input; /* If we're inside a function that wants immediate quits, @@ -5088,9 +5087,6 @@ &Qup, &Qdown, &Qtop, &Qbottom, &Qend_scroll, &Qratio }; -/* User signal events. */ -Lisp_Object Qsignal; - /* A vector, indexed by button number, giving the down-going location of currently depressed buttons, both scroll bar and non-scroll bar. @@ -5969,17 +5965,12 @@ case USER_SIGNAL_EVENT: /* A user signal. */ - if (event->code == 0) - return Qsignal; - else - { - char *name = find_user_signal_name (event->code); - - if (name) - return intern (name); - else - return make_number (event->code); - } + { + char *name = find_user_signal_name (event->code); + if (!name) + abort (); + return intern (name); + } case SAVE_SESSION_EVENT: return Qsave_session; @@ -7156,8 +7147,6 @@ mask = sigblock (sigmask (p->sig)); do { - buf.code = 0; - kbd_buffer_store_event (&buf); buf.code = p->sig; kbd_buffer_store_event (&buf); p->npending--; @@ -11183,9 +11172,6 @@ staticpro (&Qmac_apple_event); #endif - Qsignal = intern ("signal"); - staticpro (&Qsignal); - Qmenu_enable = intern ("menu-enable"); staticpro (&Qmenu_enable); Qmenu_alias = intern ("menu-alias");