diff options
| author | Miles Bader | 2007-04-24 21:56:25 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-04-24 21:56:25 +0000 |
| commit | 991a760232de757d71d8dbbed47ee12d81e29d53 (patch) | |
| tree | 2440730c37ae3f167a50f5c3ac5eaeab9b72b7b0 /src/keymap.c | |
| parent | 0bb328f8f6fce06a7fc65670c7d5c011b613e1c5 (diff) | |
| parent | 3851329262d6558d5e1a93157d44777d0a39e38e (diff) | |
| download | emacs-991a760232de757d71d8dbbed47ee12d81e29d53.tar.gz emacs-991a760232de757d71d8dbbed47ee12d81e29d53.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 698-710)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 216)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index d953df008d7..4a5c53ca626 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1148,7 +1148,8 @@ DEF is anything that can be a key's definition: | |||
| 1148 | a cons (STRING . DEFN), meaning that DEFN is the definition | 1148 | a cons (STRING . DEFN), meaning that DEFN is the definition |
| 1149 | (DEFN should be a valid definition in its own right), | 1149 | (DEFN should be a valid definition in its own right), |
| 1150 | or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP, | 1150 | or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP, |
| 1151 | or an extended menu item definition. (See info node `Extended Menu Items'.) | 1151 | or an extended menu item definition. |
| 1152 | (See info node `(elisp)Extended Menu Items'.) | ||
| 1152 | 1153 | ||
| 1153 | If KEYMAP is a sparse keymap with a binding for KEY, the existing | 1154 | If KEYMAP is a sparse keymap with a binding for KEY, the existing |
| 1154 | binding is altered. If there is no binding for KEY, the new pair | 1155 | binding is altered. If there is no binding for KEY, the new pair |