diff options
| author | Richard M. Stallman | 1999-01-24 20:08:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-01-24 20:08:10 +0000 |
| commit | 0afc861ba9d0f4780fe4031eeecdf660fbe86cfc (patch) | |
| tree | d57017759f51f72a4a3c3ea7e7e53a1ffc554c20 /src/keyboard.c | |
| parent | cf591cc18badd0af3ab7cb6bd915e1594342c78a (diff) | |
| download | emacs-0afc861ba9d0f4780fe4031eeecdf660fbe86cfc.tar.gz emacs-0afc861ba9d0f4780fe4031eeecdf660fbe86cfc.zip | |
(read_key_sequence): Fix previous change.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 18 |
1 files changed, 9 insertions, 9 deletions
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, | |||
| 7404 | = get_keyelt (access_keymap (fkey_next, key, 1, 0), 1); | 7404 | = get_keyelt (access_keymap (fkey_next, key, 1, 0), 1); |
| 7405 | 7405 | ||
| 7406 | /* Handle symbol with autoload definition. */ | 7406 | /* Handle symbol with autoload definition. */ |
| 7407 | if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next)) | 7407 | if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next)) |
| 7408 | && CONSP (XSYMBOL (keytran_next)->function) | 7408 | && CONSP (XSYMBOL (fkey_next)->function) |
| 7409 | && EQ (XCONS (XSYMBOL (keytran_next)->function)->car, Qautoload)) | 7409 | && EQ (XCONS (XSYMBOL (fkey_next)->function)->car, Qautoload)) |
| 7410 | do_autoload (XSYMBOL (keytran_next)->function, | 7410 | do_autoload (XSYMBOL (fkey_next)->function, |
| 7411 | keytran_next); | 7411 | fkey_next); |
| 7412 | 7412 | ||
| 7413 | /* Handle a symbol whose function definition is a keymap | 7413 | /* Handle a symbol whose function definition is a keymap |
| 7414 | or an array. */ | 7414 | or an array. */ |
| 7415 | if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next)) | 7415 | if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next)) |
| 7416 | && (!NILP (Farrayp (XSYMBOL (keytran_next)->function)) | 7416 | && (!NILP (Farrayp (XSYMBOL (fkey_next)->function)) |
| 7417 | || !NILP (Fkeymapp (XSYMBOL (keytran_next)->function)))) | 7417 | || !NILP (Fkeymapp (XSYMBOL (fkey_next)->function)))) |
| 7418 | keytran_next = XSYMBOL (keytran_next)->function; | 7418 | fkey_next = XSYMBOL (fkey_next)->function; |
| 7419 | 7419 | ||
| 7420 | #if 0 /* I didn't turn this on, because it might cause trouble | 7420 | #if 0 /* I didn't turn this on, because it might cause trouble |
| 7421 | for the mapping of return into C-m and tab into C-i. */ | 7421 | for the mapping of return into C-m and tab into C-i. */ |