diff options
| author | Karl Heuer | 1995-01-24 03:16:34 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-01-24 03:16:34 +0000 |
| commit | 0d882d52f4af6f5c41d121fb50ecd350898888d8 (patch) | |
| tree | 965f9268f46d748ce9c998518c0cb8f73c65da44 /src | |
| parent | 453827d052d2d37fb35436cd9b98d0eca0cfc190 (diff) | |
| download | emacs-0d882d52f4af6f5c41d121fb50ecd350898888d8.tar.gz emacs-0d882d52f4af6f5c41d121fb50ecd350898888d8.zip | |
(read_key_sequence): Don't wait for a possible key translation sequence if we
already have a binding.
Add missing break statement.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index e67549c6e8f..23f9fccbbb5 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Keyboard and mouse input; editor command loop. | 1 | /* Keyboard and mouse input; editor command loop. |
| 2 | Copyright (C) 1985,86,87,88,89,93,94 Free Software Foundation, Inc. | 2 | Copyright (C) 1985,86,87,88,89,93,94,95 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -4666,7 +4666,8 @@ read_key_sequence (keybuf, bufsize, prompt) | |||
| 4666 | && fkey_start < t | 4666 | && fkey_start < t |
| 4667 | /* mock input is never part of a function key's sequence. */ | 4667 | /* mock input is never part of a function key's sequence. */ |
| 4668 | && mock_input <= fkey_start) | 4668 | && mock_input <= fkey_start) |
| 4669 | || (keytran_start < t && key_translation_possible) | 4669 | || (first_binding >= nmaps |
| 4670 | && keytran_start < t && key_translation_possible) | ||
| 4670 | /* Don't return in the middle of a possible function key sequence, | 4671 | /* Don't return in the middle of a possible function key sequence, |
| 4671 | if the only bindings we found were via case conversion. | 4672 | if the only bindings we found were via case conversion. |
| 4672 | Thus, if ESC O a has a function-key-map translation | 4673 | Thus, if ESC O a has a function-key-map translation |
| @@ -4949,6 +4950,7 @@ read_key_sequence (keybuf, bufsize, prompt) | |||
| 4949 | /* The Microsoft C compiler can't handle the goto that | 4950 | /* The Microsoft C compiler can't handle the goto that |
| 4950 | would go here. */ | 4951 | would go here. */ |
| 4951 | dummyFlag = 1; | 4952 | dummyFlag = 1; |
| 4953 | break; | ||
| 4952 | } | 4954 | } |
| 4953 | 4955 | ||
| 4954 | if (SYMBOLP (head)) | 4956 | if (SYMBOLP (head)) |