Commit cebd887d authored by Jim Blandy's avatar Jim Blandy
Browse files

* keymap.c (access_keymap, store_in_keymap,

	Fsingle_key_description): No need to check for
	EVENT_HAS_PARAMETERS before using EVENT_HEAD; the latter now
	works properly on all sorts of events.
parent c1f6cc77
...@@ -215,7 +215,6 @@ access_keymap (map, idx) ...@@ -215,7 +215,6 @@ access_keymap (map, idx)
/* If idx is a list (some sort of mouse click, perhaps?), /* If idx is a list (some sort of mouse click, perhaps?),
the index we want to use is the car of the list, which the index we want to use is the car of the list, which
ought to be a symbol. */ ought to be a symbol. */
if (EVENT_HAS_PARAMETERS (idx))
idx = EVENT_HEAD (idx); idx = EVENT_HEAD (idx);
if (XTYPE (idx) == Lisp_Int if (XTYPE (idx) == Lisp_Int
...@@ -312,7 +311,6 @@ store_in_keymap (keymap, idx, def) ...@@ -312,7 +311,6 @@ store_in_keymap (keymap, idx, def)
/* If idx is a list (some sort of mouse click, perhaps?), /* If idx is a list (some sort of mouse click, perhaps?),
the index we want to use is the car of the list, which the index we want to use is the car of the list, which
ought to be a symbol. */ ought to be a symbol. */
if (EVENT_HAS_PARAMETERS (idx))
idx = EVENT_HEAD (idx); idx = EVENT_HEAD (idx);
if (XTYPE (idx) == Lisp_Int if (XTYPE (idx) == Lisp_Int
...@@ -1105,7 +1103,6 @@ Control characters turn into C-whatever, etc.") ...@@ -1105,7 +1103,6 @@ Control characters turn into C-whatever, etc.")
register unsigned char c; register unsigned char c;
char tem[6]; char tem[6];
if (EVENT_HAS_PARAMETERS (key))
key = EVENT_HEAD (key); key = EVENT_HEAD (key);
switch (XTYPE (key)) switch (XTYPE (key))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment