diff options
| author | Johan Bockgård | 2009-04-26 20:55:30 +0000 |
|---|---|---|
| committer | Johan Bockgård | 2009-04-26 20:55:30 +0000 |
| commit | 9d0644c40f36ee13c7a71c9f9013aeb2cda21a37 (patch) | |
| tree | fb6806a5ab50a355ab7d589d3bcc0eb99e8f0364 /src | |
| parent | 6c4cfaf836b948efbffce349f5c20a0819d6bfdd (diff) | |
| download | emacs-9d0644c40f36ee13c7a71c9f9013aeb2cda21a37.tar.gz emacs-9d0644c40f36ee13c7a71c9f9013aeb2cda21a37.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 ae770b1953b..a2e8264cbc5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-04-26 Johan Bockgård <bojohan@gnu.org> | ||
| 2 | |||
| 3 | * keyboard.c (syms_of_keyboard) <input-decode-map>: Doc fix. | ||
| 4 | |||
| 1 | 2009-04-25 Jason Rumney <jasonr@gnu.org> | 5 | 2009-04-25 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * w32font.c (clear_cached_metrics): Remove, unused since 2008-08-02. | 7 | * w32font.c (clear_cached_metrics): Remove, unused since 2008-08-02. |
diff --git a/src/keyboard.c b/src/keyboard.c index 05c5102340f..9f9705d56bf 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12333,7 +12333,7 @@ This is used mainly for mapping ASCII function key sequences into | |||
| 12333 | real Emacs function key events (symbols). | 12333 | real Emacs function key events (symbols). |
| 12334 | 12334 | ||
| 12335 | The `read-key-sequence' function replaces any subsequence bound by | 12335 | The `read-key-sequence' function replaces any subsequence bound by |
| 12336 | `input-key-map' with its binding. Contrary to `function-key-map', | 12336 | `input-decode-map' with its binding. Contrary to `function-key-map', |
| 12337 | this map applies its rebinding regardless of the presence of an ordinary | 12337 | this map applies its rebinding regardless of the presence of an ordinary |
| 12338 | binding. So it is more like `key-translation-map' except that it applies | 12338 | binding. So it is more like `key-translation-map' except that it applies |
| 12339 | before `function-key-map' rather than after. | 12339 | before `function-key-map' rather than after. |