Don't define Qusr1_signal and Qusr2_signal.

(syms_of_emacs): Don't initialize them.
(handle_USR1_signal, handle_USR2_signal): Set event type to
user_signal instead of non_ascii_keystroke, and use plain integers
as code instead of Lisp symbols.

1 files changed, 4 insertions, 11 deletions

diff --git a/src/emacs.c b/src/emacs.c
index d01f55aa393..40c1b16f745 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -117,8 +117,6 @@ Lisp_Object Vsystem_configuration_options;
 
 Lisp_Object Qfile_name_handler_alist;
 
-Lisp_Object Qusr1_signal, Qusr2_signal;
-
 /* If non-zero, emacs should not attempt to use an window-specific code,
    but instead should use the virtual terminal under which it was started */
 int inhibit_window_system;
@@ -189,8 +187,8 @@ handle_USR1_signal (sig)
 {
   struct input_event buf;
 
-  buf.kind = non_ascii_keystroke;
-  buf.code = Qusr1_signal;
+  buf.kind = user_signal;
+  buf.code = 0;
   buf.frame_or_window = Fselected_frame ();
   buf.modifiers = 0;
   buf.timestamp = 0;
@@ -206,8 +204,8 @@ handle_USR2_signal (sig)
 {
   struct input_event buf;
 
-  buf.kind = non_ascii_keystroke;
-  buf.code = Qusr2_signal;
+  buf.kind = user_signal;
+  buf.code = 1;
   buf.frame_or_window = Fselected_frame ();
   buf.modifiers = 0;
   buf.timestamp = 0;
@@ -1861,11 +1859,6 @@ syms_of_emacs ()
   Qfile_name_handler_alist = intern ("file-name-handler-alist");
   staticpro (&Qfile_name_handler_alist);
 
-  Qusr1_signal = intern ("usr1-signal");
-  staticpro (&Qusr1_signal);
-  Qusr2_signal = intern ("usr2-signal");
-  staticpro (&Qusr2_signal);
-
 #ifndef CANNOT_DUMP
 #ifdef HAVE_SHM
   defsubr (&Sdump_emacs_data);