changeset 15128:a5faedec59f1

(Fevent_convert_list): Never treat last elt as modifier.
author Richard M. Stallman <rms@gnu.org>
date Thu, 02 May 1996 21:39:06 +0000
parents 654bc3990b4d
children e48968f04ea7
files src/keyboard.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Thu May 02 21:20:55 1996 +0000
+++ b/src/keyboard.c	Thu May 02 21:39:06 1996 +0000
@@ -4444,7 +4444,7 @@
   "Convert the event description list EVENT-DESC to an event type.\n\
 EVENT-DESC should contain one base event type (a character or symbol)\n\
 and zero or more modifier names (control, meta, hyper, super, shift, alt,\n\
-drag, down, double or triple).\n\
+drag, down, double or triple).  The base must be last.\n\
 The return value is an event type (a character or symbol) which\n\
 has the same base event type and all the specified modifiers.")
   (event_desc)
@@ -4462,9 +4462,10 @@
       int this = 0;
 
       elt = XCONS (rest)->car;
+      rest = XCONS (rest)->cdr;
 
       /* Given a symbol, see if it is a modifier name.  */
-      if (SYMBOLP (elt))
+      if (SYMBOLP (elt) && CONSP (rest))
 	this = parse_solitary_modifier (elt);
 
       if (this != 0)
@@ -4474,7 +4475,6 @@
       else
 	base = elt;
 
-      rest = XCONS (rest)->cdr;
     }
 
   /* Let the symbol A refer to the character A.  */