procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(read_key_sequence): Tell get_keyelt to look handle autoloads.

Browse source 
Handle symbols defined as keymaps, and autoloaded keymaps.
This commit is contained in:
Richard M. Stallman 1999-01-06 23:54:44 +00:00
parent 5ffaf437c9
commit e83f6bb074
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/keyboard.c
View file

@ -7509,10 +7509,21 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
keytran_next = keytran_map;
keytran_next
= get_keyelt (access_keymap (keytran_next, key, 1, 0), 0);
= get_keyelt (access_keymap (keytran_next, key, 1, 0), 1);
if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
&& CONSP (XSYMBOL (keytran_next)->function)
&& EQ (XCONS (XSYMBOL (keytran_next)->function)->car, Qautoload))
do_autoload (XSYMBOL (keytran_next)->function,
keytran_next);
/* Handle a symbol whose function definition is a keymap. */
if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
&& !NILP (Fkeymapp (XSYMBOL (keytran_next)->function)))
keytran_next = XSYMBOL (keytran_next)->function;
/* If the key translation map gives a function, not an
array, then call the function with no args and use
array, then call the function with one arg and use
its value instead. */
if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
&& keytran_end == t)