aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-05-20 10:50:32 -0400
committerChong Yidong2010-05-20 10:50:32 -0400
commitaeb77d46603d3e2b302b377d0e354dff5625a9e6 (patch)
tree5dcb8364d1a466a0a113981c8ca443aa23a1aff1 /src
parentc3bb441dd072089f9e6815d9d41c27b5d84aebde (diff)
downloademacs-aeb77d46603d3e2b302b377d0e354dff5625a9e6.tar.gz
emacs-aeb77d46603d3e2b302b377d0e354dff5625a9e6.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/ChangeLog6
-rw-r--r--src/keyboard.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6418e8af4a1..929cea2832a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12010-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
12010-05-19 Stefan Monnier <monnier@iro.umontreal.ca> 72010-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * editfns.c (Fbyte_to_string): New function. 9 * editfns.c (Fbyte_to_string): New function.
diff --git a/src/keyboard.c b/src/keyboard.c
index 1e331d078ce..836fc183eac 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12103,7 +12103,7 @@ The value `kill-region' is special; it means that the previous command
12103was a kill command. 12103was a kill command.
12104 12104
12105`last-command' has a separate binding for each terminal device. 12105`last-command' has a separate binding for each terminal device.
12106See Info node `(elisp)Multiple displays'. */); 12106See Info node `(elisp)Multiple Terminals'. */);
12107 12107
12108 DEFVAR_KBOARD ("real-last-command", Vreal_last_command, 12108 DEFVAR_KBOARD ("real-last-command", Vreal_last_command,
12109 doc: /* Same as `last-command', but never altered by Lisp code. */); 12109 doc: /* Same as `last-command', but never altered by Lisp code. */);
@@ -12241,8 +12241,8 @@ untranslated. In a vector, an element which is nil means "no translation".
12241This is applied to the characters supplied to input methods, not their 12241This is applied to the characters supplied to input methods, not their
12242output. See also `translation-table-for-input'. 12242output. See also `translation-table-for-input'.
12243 12243
12244This variable has a separate binding for each terminal. See Info node 12244This variable has a separate binding for each terminal.
12245`(elisp)Multiple displays'. */); 12245See Info node `(elisp)Multiple Terminals'. */);
12246 12246
12247 DEFVAR_BOOL ("cannot-suspend", &cannot_suspend, 12247 DEFVAR_BOOL ("cannot-suspend", &cannot_suspend,
12248 doc: /* Non-nil means to always spawn a subshell instead of suspending. 12248 doc: /* Non-nil means to always spawn a subshell instead of suspending.
@@ -12333,7 +12333,7 @@ set up a different keymap for reading the next command.
12333 12333
12334`overriding-terminal-local-map' has a separate binding for each 12334`overriding-terminal-local-map' has a separate binding for each
12335terminal device. 12335terminal device.
12336See Info node `(elisp)Multiple displays'. */); 12336See Info node `(elisp)Multiple Terminals'. */);
12337 12337
12338 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, 12338 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map,
12339 doc: /* Keymap that overrides all other local keymaps. 12339 doc: /* Keymap that overrides all other local keymaps.
@@ -12361,7 +12361,7 @@ numeric keysym code (sans the \"system-specific\" bit 1<<28)
12361and SYMBOL is its name. 12361and SYMBOL is its name.
12362 12362
12363`system-key-alist' has a separate binding for each terminal device. 12363`system-key-alist' has a separate binding for each terminal device.
12364See Info node `(elisp)Multiple displays'. */); 12364See Info node `(elisp)Multiple Terminals'. */);
12365 12365
12366 DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map, 12366 DEFVAR_KBOARD ("local-function-key-map", Vlocal_function_key_map,
12367 doc: /* Keymap that translates key sequences to key sequences during input. 12367 doc: /* Keymap that translates key sequences to key sequences during input.
@@ -12387,7 +12387,7 @@ Typing `ESC O P' to `read-key-sequence' would return [f1]. Typing
12387typing `ESC O P x' would return [f1 x]. 12387typing `ESC O P x' would return [f1 x].
12388 12388
12389`local-function-key-map' has a separate binding for each terminal 12389`local-function-key-map' has a separate binding for each terminal
12390device. See Info node `(elisp)Multiple displays'. If you need to 12390device. See Info node `(elisp)Multiple Terminals'. If you need to
12391define a binding on all terminals, change `function-key-map' 12391define a binding on all terminals, change `function-key-map'
12392instead. Initially, `local-function-key-map' is an empty keymap that 12392instead. Initially, `local-function-key-map' is an empty keymap that
12393has `function-key-map' as its parent on all terminal devices. */); 12393has `function-key-map' as its parent on all terminal devices. */);