diff options
| author | Andreas Schwab | 2008-09-29 21:31:20 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-09-29 21:31:20 +0000 |
| commit | 79f66be1b987cf350d3c76a27db822e27355773a (patch) | |
| tree | 19fd0549f2f1e0ea99963b44ce655506a1c2ae71 /src | |
| parent | 613658d4b2f4b5a48dc5cb3340f17b3520cbe5e8 (diff) | |
| download | emacs-79f66be1b987cf350d3c76a27db822e27355773a.tar.gz emacs-79f66be1b987cf350d3c76a27db822e27355773a.zip | |
(syms_of_keyboard) <input-decode-map>: Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index da49011d176..19a6f91070c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-09-29 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * keyboard.c (syms_of_keyboard) <input-decode-map>: Doc fix. | ||
| 4 | |||
| 1 | 2008-09-28 Martin Rudalics <rudalics@gmx.at> | 5 | 2008-09-28 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * character.c (Fchar_resolve_modifiers): Rewrite Elisp function | 7 | * character.c (Fchar_resolve_modifiers): Rewrite Elisp function |
diff --git a/src/keyboard.c b/src/keyboard.c index 52ecf69a193..ec1b117a13a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12212,7 +12212,7 @@ This is used mainly for mapping ASCII function key sequences into | |||
| 12212 | real Emacs function key events (symbols). | 12212 | real Emacs function key events (symbols). |
| 12213 | 12213 | ||
| 12214 | The `read-key-sequence' function replaces any subsequence bound by | 12214 | The `read-key-sequence' function replaces any subsequence bound by |
| 12215 | `local-function-key-map' with its binding. Contrary to `function-key-map', | 12215 | `input-key-map' with its binding. Contrary to `function-key-map', |
| 12216 | this map applies its rebinding regardless of the presence of an ordinary | 12216 | this map applies its rebinding regardless of the presence of an ordinary |
| 12217 | binding. So it is more like `key-translation-map' except that it applies | 12217 | binding. So it is more like `key-translation-map' except that it applies |
| 12218 | before `function-key-map' rather than after. | 12218 | before `function-key-map' rather than after. |