diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
| commit | 4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch) | |
| tree | af17010f0864173dd6416585f08d686377791412 /src/keymap.c | |
| parent | 76acf92ebe73e35528c5966a21328305ba7b5aef (diff) | |
| parent | db6292445840e2795f35ebad62a14314fc3c7c21 (diff) | |
| download | emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.bz2 emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
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 176b6760e36..3fd81effb04 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1147,7 +1147,8 @@ DEF is anything that can be a key's definition: or another symbol whose function definition is used, etc.), a cons (STRING . DEFN), meaning that DEFN is the definition (DEFN should be a valid definition in its own right), - or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP. + or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP, + or an extended menu item definition. (See info node `Extended Menu Items'.) If KEYMAP is a sparse keymap with a binding for KEY, the existing binding is altered. If there is no binding for KEY, the new pair |