diff options
| author | Stefan Monnier | 2013-02-13 14:43:06 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-02-13 14:43:06 -0500 |
| commit | fe3362617385f936576ba0acdac66e2f7da38391 (patch) | |
| tree | 56221b5002ffdf5446dc6942db54d3c62b0578c5 /src | |
| parent | d7291032804bbb2f577ef1425dac37e8510181a3 (diff) | |
| download | emacs-fe3362617385f936576ba0acdac66e2f7da38391.tar.gz emacs-fe3362617385f936576ba0acdac66e2f7da38391.zip | |
* src/keyboard.c (syms_of_keyboard): Further tweaks of docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bf27fd4066d..82cc8f0f552 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-02-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * keyboard.c (syms_of_keyboard): Further tweaks of docstring. | ||
| 4 | |||
| 1 | 2013-02-13 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-02-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * font.c (font_range): Add pos_byte argument. Adjust comment | 7 | * font.c (font_range): Add pos_byte argument. Adjust comment |
diff --git a/src/keyboard.c b/src/keyboard.c index 4ead0538b92..47507483859 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11630,8 +11630,8 @@ definition will take precedence. */); | |||
| 11630 | 11630 | ||
| 11631 | DEFVAR_LISP ("key-translation-map", Vkey_translation_map, | 11631 | DEFVAR_LISP ("key-translation-map", Vkey_translation_map, |
| 11632 | doc: /* Keymap of key translations that can override keymaps. | 11632 | doc: /* Keymap of key translations that can override keymaps. |
| 11633 | This keymap works like `function-key-map', but comes after that, | 11633 | This keymap works like `input-decode-map', but comes after `function-key-map'. |
| 11634 | and its non-prefix bindings override ordinary bindings. */); | 11634 | Another difference is that it is global rather than terminal-local. */); |
| 11635 | Vkey_translation_map = Fmake_sparse_keymap (Qnil); | 11635 | Vkey_translation_map = Fmake_sparse_keymap (Qnil); |
| 11636 | 11636 | ||
| 11637 | DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list, | 11637 | DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list, |