aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 1d07ff0df6a..d8c46e0d3db 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4444,7 +4444,7 @@ DEFUN ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0,
4444 "Convert the event description list EVENT-DESC to an event type.\n\ 4444 "Convert the event description list EVENT-DESC to an event type.\n\
4445EVENT-DESC should contain one base event type (a character or symbol)\n\ 4445EVENT-DESC should contain one base event type (a character or symbol)\n\
4446and zero or more modifier names (control, meta, hyper, super, shift, alt,\n\ 4446and zero or more modifier names (control, meta, hyper, super, shift, alt,\n\
4447drag, down, double or triple).\n\ 4447drag, down, double or triple). The base must be last.\n\
4448The return value is an event type (a character or symbol) which\n\ 4448The return value is an event type (a character or symbol) which\n\
4449has the same base event type and all the specified modifiers.") 4449has the same base event type and all the specified modifiers.")
4450 (event_desc) 4450 (event_desc)
@@ -4462,9 +4462,10 @@ has the same base event type and all the specified modifiers.")
4462 int this = 0; 4462 int this = 0;
4463 4463
4464 elt = XCONS (rest)->car; 4464 elt = XCONS (rest)->car;
4465 rest = XCONS (rest)->cdr;
4465 4466
4466 /* Given a symbol, see if it is a modifier name. */ 4467 /* Given a symbol, see if it is a modifier name. */
4467 if (SYMBOLP (elt)) 4468 if (SYMBOLP (elt) && CONSP (rest))
4468 this = parse_solitary_modifier (elt); 4469 this = parse_solitary_modifier (elt);
4469 4470
4470 if (this != 0) 4471 if (this != 0)
@@ -4474,7 +4475,6 @@ has the same base event type and all the specified modifiers.")
4474 else 4475 else
4475 base = elt; 4476 base = elt;
4476 4477
4477 rest = XCONS (rest)->cdr;
4478 } 4478 }
4479 4479
4480 /* Let the symbol A refer to the character A. */ 4480 /* Let the symbol A refer to the character A. */