diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-28 10:56:51 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-28 10:56:51 -0400 |
commit | 70edffb13005de4aa58ba818559b85aa63a1cdd4 (patch) | |
tree | f25322a5427af78d2f055a50cc008bb124eeaba5 /doc/lispref/keymaps.texi | |
parent | 3a51f0eb4168885b869641e9d5c98e3f40e5a515 (diff) | |
download | emacs-70edffb13005de4aa58ba818559b85aa63a1cdd4.tar.gz |
* lisp/tmm.el (tmm-prompt): Use map-keymap.
* doc/lispref/keymaps.texi (Format of Keymaps): Document the multiple
inheritance format.
Fixes: debbugs:12744
Diffstat (limited to 'doc/lispref/keymaps.texi')
-rw-r--r-- | doc/lispref/keymaps.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 8fe729d50f2..f658f7e66fb 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -210,6 +210,11 @@ Aside from elements that specify bindings for keys, a keymap can also have a string as an element. This is called the @dfn{overall prompt string} and makes it possible to use the keymap as a menu. @xref{Defining Menus}. + +@item (keymap @dots{}) +If an element of a keymap is itself a keymap, it counts as if this inner keymap +were inlined in the outer keymap. This is used for multiple-inheritance, such +as in @code{make-composed-keymap}. @end table When the binding is @code{nil}, it doesn't constitute a definition |