diff options
| author | Jim Blandy | 1993-07-18 06:25:40 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-07-18 06:25:40 +0000 |
| commit | 718ca51e403c565c8cb35fbf7f4eb6bb00fee0b8 (patch) | |
| tree | d6821b8e386e4b86c238b7346bc0322642a60e9a | |
| parent | f5ea616372f7f15b402c8d13301cb8ea41d88be9 (diff) | |
| download | emacs-718ca51e403c565c8cb35fbf7f4eb6bb00fee0b8.tar.gz emacs-718ca51e403c565c8cb35fbf7f4eb6bb00fee0b8.zip | |
* keyboard.c (read_key_sequence): Accept both strings and vectors
as bindings in function-key-map.
* keymap.c (Vfunction_key_map in syms_of_keymap): Doc fix.
* keymap.c (syms_of_keymap): Doc fix.
| -rw-r--r-- | src/keymap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/keymap.c b/src/keymap.c index 8f61faa529c..36f34bd25ca 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2243,14 +2243,14 @@ terminals at any point in a key sequence.\n\ | |||
| 2243 | The read-key-sequence function replaces subsequences bound by\n\ | 2243 | The read-key-sequence function replaces subsequences bound by\n\ |
| 2244 | function-key-map with their bindings. When the current local and global\n\ | 2244 | function-key-map with their bindings. When the current local and global\n\ |
| 2245 | keymaps have no binding for the current key sequence but\n\ | 2245 | keymaps have no binding for the current key sequence but\n\ |
| 2246 | function-key-map binds a suffix of the sequence to a vector,\n\ | 2246 | function-key-map binds a suffix of the sequence to a vector or string,\n\ |
| 2247 | read-key-sequence replaces the matching suffix with its binding, and\n\ | 2247 | read-key-sequence replaces the matching suffix with its binding, and\n\ |
| 2248 | continues with the new sequence.\n\ | 2248 | continues with the new sequence.\n\ |
| 2249 | \n\ | 2249 | \n\ |
| 2250 | For example, suppose function-key-map binds `ESC O P' to [pf1].\n\ | 2250 | For example, suppose function-key-map binds `ESC O P' to [f1].\n\ |
| 2251 | Typing `ESC O P' to read-key-sequence would return [pf1]. Typing\n\ | 2251 | Typing `ESC O P' to read-key-sequence would return [f1]. Typing\n\ |
| 2252 | `C-x ESC O P' would return [?\C-x pf1]. If [pf1] were a prefix\n\ | 2252 | `C-x ESC O P' would return [?\\C-x f1]. If [f1] were a prefix\n\ |
| 2253 | key, typing `ESC O P x' would return [pf1 x]."); | 2253 | key, typing `ESC O P x' would return [f1 x]."); |
| 2254 | Vfunction_key_map = Fmake_sparse_keymap (Qnil); | 2254 | Vfunction_key_map = Fmake_sparse_keymap (Qnil); |
| 2255 | 2255 | ||
| 2256 | Qsingle_key_description = intern ("single-key-description"); | 2256 | Qsingle_key_description = intern ("single-key-description"); |