diff options
| author | Chong Yidong | 2010-07-10 15:01:01 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-07-10 15:01:01 -0400 |
| commit | 7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0 (patch) | |
| tree | 301c219611060db34a983f5b7dba58cf1fa93b69 /src/keymap.c | |
| parent | 481044622937b001ee07a6f8c3f81c1e73ef9eaf (diff) | |
| parent | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (diff) | |
| download | emacs-7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0.tar.gz emacs-7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c index 1245caf3b9b..40005a51008 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1126,11 +1126,13 @@ DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, | |||
| 1126 | doc: /* In KEYMAP, define key sequence KEY as DEF. | 1126 | doc: /* In KEYMAP, define key sequence KEY as DEF. |
| 1127 | KEYMAP is a keymap. | 1127 | KEYMAP is a keymap. |
| 1128 | 1128 | ||
| 1129 | KEY is a string or a vector of symbols and characters meaning a | 1129 | KEY is a string or a vector of symbols and characters, representing a |
| 1130 | sequence of keystrokes and events. Non-ASCII characters with codes | 1130 | sequence of keystrokes and events. Non-ASCII characters with codes |
| 1131 | above 127 (such as ISO Latin-1) can be included if you use a vector. | 1131 | above 127 (such as ISO Latin-1) can be represented by vectors. |
| 1132 | Using [t] for KEY creates a default definition, which applies to any | 1132 | Two types of vector have special meanings: |
| 1133 | event type that has no other definition in this keymap. | 1133 | [remap COMMAND] remaps any key binding for COMMAND. |
| 1134 | [t] creates a default definition, which applies to any event with no | ||
| 1135 | other definition in KEYMAP. | ||
| 1134 | 1136 | ||
| 1135 | DEF is anything that can be a key's definition: | 1137 | DEF is anything that can be a key's definition: |
| 1136 | nil (means key is undefined in this keymap), | 1138 | nil (means key is undefined in this keymap), |