aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-06-19 14:02:41 -0400
committerChong Yidong2010-06-19 14:02:41 -0400
commit277c5f18026217608e4ca773e5a74899b46d4575 (patch)
treebeaf922128f6ed7568d9b55b7b9af7af69c0aa4f /src
parent024681aa4de727cab9420183a5869f1732bad3be (diff)
downloademacs-277c5f18026217608e4ca773e5a74899b46d4575.tar.gz
emacs-277c5f18026217608e4ca773e5a74899b46d4575.zip
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 26c95ae77ed..680f364a1fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-06-19 Chong Yidong <cyd@stupidchicken.com>
2
3 * keymap.c (Fdefine_key): Doc fix (Bug#6460).
4
12010-06-15 Glenn Morris <rgm@gnu.org> 52010-06-15 Glenn Morris <rgm@gnu.org>
2 6
3 * editfns.c (Fbyte_to_string): Pacify compiler. 7 * editfns.c (Fbyte_to_string): Pacify compiler.
diff --git a/src/keymap.c b/src/keymap.c
index 53b6795d623..b5efd12cd6e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1175,11 +1175,13 @@ DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0,
1175 doc: /* In KEYMAP, define key sequence KEY as DEF. 1175 doc: /* In KEYMAP, define key sequence KEY as DEF.
1176KEYMAP is a keymap. 1176KEYMAP is a keymap.
1177 1177
1178KEY is a string or a vector of symbols and characters meaning a 1178KEY is a string or a vector of symbols and characters, representing a
1179sequence of keystrokes and events. Non-ASCII characters with codes 1179sequence of keystrokes and events. Non-ASCII characters with codes
1180above 127 (such as ISO Latin-1) can be included if you use a vector. 1180above 127 (such as ISO Latin-1) can be represented by vectors.
1181Using [t] for KEY creates a default definition, which applies to any 1181Two types of vector have special meanings:
1182event type that has no other definition in this keymap. 1182 [remap COMMAND] remaps any key binding for COMMAND in KEYMAP.
1183 [t] creates a default definition, which applies to any event with no
1184 other definition in KEYMAP.
1183 1185
1184DEF is anything that can be a key's definition: 1186DEF is anything that can be a key's definition:
1185 nil (means key is undefined in this keymap), 1187 nil (means key is undefined in this keymap),