[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c,v |
Date: |
Mon, 04 Dec 2006 12:26:59 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/12/04 12:26:58
Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -b -r1.880 -r1.881
--- keyboard.c 24 Nov 2006 09:51:21 -0000 1.880
+++ keyboard.c 4 Dec 2006 12:26:58 -0000 1.881
@@ -3784,7 +3784,8 @@
if (!NILP (Vthrow_on_input)
&& event->kind != FOCUS_IN_EVENT
&& event->kind != HELP_EVENT
- && event->kind != DEICONIFY_EVENT)
+ && event->kind != DEICONIFY_EVENT
+ && !(event->kind == USER_SIGNAL_EVENT && event->code == 0))
{
Vquit_flag = Vthrow_on_input;
/* If we're inside a function that wants immediate quits,
@@ -5073,13 +5074,7 @@
};
/* User signal events. */
-Lisp_Object Qusr1_signal, Qusr2_signal;
-
-Lisp_Object *lispy_user_signals[] =
-{
- &Qusr1_signal, &Qusr2_signal
-};
-
+Lisp_Object Qsignal, Qusr1, Qusr2;
/* A vector, indexed by button number, giving the down-going location
of currently depressed buttons, both scroll bar and non-scroll bar.
@@ -5953,7 +5948,17 @@
case USER_SIGNAL_EVENT:
/* A user signal. */
- return *lispy_user_signals[event->code];
+ switch (event->code)
+ {
+ case 0:
+ return Qsignal;
+ case SIGUSR1:
+ return Qusr1;
+ case SIGUSR2:
+ return Qusr2;
+ default:
+ return make_number (event->code);
+ }
case SAVE_SESSION_EVENT:
return Qsave_session;
@@ -11026,10 +11031,12 @@
staticpro (&Qmac_apple_event);
#endif
- Qusr1_signal = intern ("usr1-signal");
- staticpro (&Qusr1_signal);
- Qusr2_signal = intern ("usr2-signal");
- staticpro (&Qusr2_signal);
+ Qsignal = intern ("signal");
+ staticpro (&Qsignal);
+ Qusr1 = intern ("usr1");
+ staticpro (&Qusr1);
+ Qusr2 = intern ("usr2");
+ staticpro (&Qusr2);
Qmenu_enable = intern ("menu-enable");
staticpro (&Qmenu_enable);
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/04
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, YAMAMOTO Mitsuharu, 2006/12/14
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/14
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/19
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Juanma Barranquero, 2006/12/19
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Eli Zaretskii, 2006/12/22