From: Richard M. Stallman Date: Sun, 24 Jan 1999 20:08:10 +0000 (+0000) Subject: (read_key_sequence): Fix previous change. X-Git-Tag: emacs-20.4~784 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0afc861ba9d0f4780fe4031eeecdf660fbe86cfc;p=emacs.git (read_key_sequence): Fix previous change. --- diff --git a/src/keyboard.c b/src/keyboard.c index 899f83b50f1..9b6c076558f 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -7404,18 +7404,18 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, = get_keyelt (access_keymap (fkey_next, key, 1, 0), 1); /* Handle symbol with autoload definition. */ - 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); + if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next)) + && CONSP (XSYMBOL (fkey_next)->function) + && EQ (XCONS (XSYMBOL (fkey_next)->function)->car, Qautoload)) + do_autoload (XSYMBOL (fkey_next)->function, + fkey_next); /* Handle a symbol whose function definition is a keymap or an array. */ - if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next)) - && (!NILP (Farrayp (XSYMBOL (keytran_next)->function)) - || !NILP (Fkeymapp (XSYMBOL (keytran_next)->function)))) - keytran_next = XSYMBOL (keytran_next)->function; + if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next)) + && (!NILP (Farrayp (XSYMBOL (fkey_next)->function)) + || !NILP (Fkeymapp (XSYMBOL (fkey_next)->function)))) + fkey_next = XSYMBOL (fkey_next)->function; #if 0 /* I didn't turn this on, because it might cause trouble for the mapping of return into C-m and tab into C-i. */