diff options
| author | Kevin Ryde | 2010-05-20 10:53:30 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-05-20 10:53:30 -0400 |
| commit | 31c4aaf628ce21077b2f4de95bb4d0dd8e0b96ee (patch) | |
| tree | c1b3d128bd5f3edf4b566f3f52ee6bcf5981e90a /src | |
| parent | 0a5a008971666d57e8137b20e5349b0631cad0cb (diff) | |
| download | emacs-31c4aaf628ce21077b2f4de95bb4d0dd8e0b96ee.tar.gz emacs-31c4aaf628ce21077b2f4de95bb4d0dd8e0b96ee.zip | |
Doc fix (Bug#6224).
* keyboard.c (Vlast_command, Vkeyboard_translate_table)
(Voverriding_terminal_local_map, Vsystem_key_alist)
(Vlocal_function_key_map): Fix manual link in docstring (Bug#6224).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/keyboard.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0199c24d7b3..b593f5fe8dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-05-20 Kevin Ryde <user42@zip.com.au> | ||
| 2 | |||
| 3 | * keyboard.c (Vlast_command, Vkeyboard_translate_table) | ||
| 4 | (Voverriding_terminal_local_map, Vsystem_key_alist) | ||
| 5 | (Vlocal_function_key_map): Fix manual link in docstring (Bug#6224). | ||
| 6 | |||
| 1 | 2010-05-20 Glenn Morris <rgm@gnu.org> | 7 | 2010-05-20 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * Makefile.in (DEPDIR): New constant. | 9 | * Makefile.in (DEPDIR): New constant. |
diff --git a/src/keyboard.c b/src/keyboard.c index 74efb856852..63372d600e3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11985,7 +11985,7 @@ The value `kill-region' is special; it means that the previous command | |||
| 11985 | was a kill command. | 11985 | was a kill command. |
| 11986 | 11986 | ||
| 11987 | `last-command' has a separate binding for each terminal device. | 11987 | `last-command' has a separate binding for each terminal device. |
| 11988 | See Info node `(elisp)Multiple displays'. */); | 11988 | See Info node `(elisp)Multiple Terminals'. */); |
| 11989 | 11989 | ||
| 11990 | DEFVAR_KBOARD ("real-last-command", Vreal_last_command, | 11990 | DEFVAR_KBOARD ("real-last-command", Vreal_last_command, |
| 11991 | doc: /* Same as `last-command', but never altered by Lisp code. */); | 11991 | doc: /* Same as `last-command', but never altered by Lisp code. */); |
| @@ -12123,8 +12123,8 @@ untranslated. In a vector, an element which is nil means "no translation". | |||
| 12123 | This is applied to the characters supplied to input methods, not their | 12123 | This is applied to the characters supplied to input methods, not their |
| 12124 | output. See also `translation-table-for-input'. | 12124 | output. See also `translation-table-for-input'. |
| 12125 | 12125 | ||
| 12126 | This variable has a separate binding for each terminal. See Info node | 12126 | This variable has a separate binding for each terminal. |
| 12127 | `(elisp)Multiple displays'. */); | 12127 | See Info node `(elisp)Multiple Terminals'. */); |
| 12128 | 12128 | ||
| 12129 | DEFVAR_BOOL ("cannot-suspend", &cannot_suspend, | 12129 | DEFVAR_BOOL ("cannot-suspend", &cannot_suspend, |
| 12130 | doc: /* Non-nil means to always spawn a subshell instead of suspending. | 12130 | doc: /* Non-nil means to always spawn a subshell instead of suspending. |
| @@ -12215,7 +12215,7 @@ set up a different keymap for reading the next command. | |||
| 12215 | 12215 | ||
| 12216 | `overriding-terminal-local-map' has a separate binding for each | 12216 | `overriding-terminal-local-map' has a separate binding for each |
| 12217 | terminal device. | 12217 | terminal device. |
| 12218 | See Info node `(elisp)Multiple displays'. */); | 12218 | See Info node `(elisp)Multiple Terminals'. */); |
| 12219 | 12219 | ||
| 12220 | DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, | 12220 | DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, |
| 12221 | doc: /* Keymap that overrides all other local keymaps. | 12221 | doc: /* Keymap that overrides all other local keymaps. |
| @@ -12243,7 +12243,7 @@ numeric keysym code (sans the \"system-specific\" bit 1<<28) | |||
| 12243 | and SYMBOL is its name. | 12243 | and SYMBOL is its name. |
| 12244 | 12244 | ||
| 12245 | `system-key-alist' has a separate binding for each terminal device. | 12245 | `system-key-alist' has a separate binding for each terminal device. |
| 12246 | See Info node `(elisp)Multiple displays'. */); | 12246 | See Info node `(elisp)Multiple Terminals'. */); |
| 12247 | 12247 | ||
| 12248 | DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map, | 12248 | DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map, |
| 12249 | doc: /* Keymap that translates key sequences to key sequences during input. | 12249 | doc: /* Keymap that translates key sequences to key sequences during input. |
| @@ -12269,7 +12269,7 @@ Typing `ESC O P' to `read-key-sequence' would return [f1]. Typing | |||
| 12269 | typing `ESC O P x' would return [f1 x]. | 12269 | typing `ESC O P x' would return [f1 x]. |
| 12270 | 12270 | ||
| 12271 | `local-function-key-map' has a separate binding for each terminal | 12271 | `local-function-key-map' has a separate binding for each terminal |
| 12272 | device. See Info node `(elisp)Multiple displays'. If you need to | 12272 | device. See Info node `(elisp)Multiple Terminals'. If you need to |
| 12273 | define a binding on all terminals, change `function-key-map' | 12273 | define a binding on all terminals, change `function-key-map' |
| 12274 | instead. Initially, `local-function-key-map' is an empty keymap that | 12274 | instead. Initially, `local-function-key-map' is an empty keymap that |
| 12275 | has `function-key-map' as its parent on all terminal devices. */); | 12275 | has `function-key-map' as its parent on all terminal devices. */); |