[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: |
Tue, 19 Dec 2006 15:37:20 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/12/19 15:37:20
Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -b -r1.884 -r1.885
--- keyboard.c 15 Dec 2006 00:22:57 -0000 1.884
+++ keyboard.c 19 Dec 2006 15:37:20 -0000 1.885
@@ -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,16 +5965,11 @@
case USER_SIGNAL_EVENT:
/* A user signal. */
- if (event->code == 0)
- return Qsignal;
- else
{
char *name = find_user_signal_name (event->code);
-
- if (name)
+ if (!name)
+ abort ();
return intern (name);
- else
- return make_number (event->code);
}
case SAVE_SESSION_EVENT:
@@ -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");
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/04
- [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 <=
- [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