aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-09-11 02:39:16 +0000
committerChong Yidong2006-09-11 02:39:16 +0000
commit3250aca208b13f138747c48b7549b41dfe91f4f6 (patch)
tree60921ac9c0974bbdb3bcd451a62ec0b0c5f7ebf8
parent42e76a876ddee4b46cbd96729da25d5dd12f0b8b (diff)
downloademacs-3250aca208b13f138747c48b7549b41dfe91f4f6.tar.gz
emacs-3250aca208b13f138747c48b7549b41dfe91f4f6.zip
* keymaps.texi (Active Keymaps): Mention that key-binding checks
local maps.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/keymaps.texi4
2 files changed, 9 insertions, 0 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index f8713eb0394..3ce4978d956 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12006-09-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * keymaps.texi (Active Keymaps): Mention that key-binding checks
4 local maps.
5
12006-09-10 Kim F. Storm <storm@cua.dk> 62006-09-10 Kim F. Storm <storm@cua.dk>
2 7
3 * display.texi (Forcing Redisplay): Document return value of 8 * display.texi (Forcing Redisplay): Document return value of
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 13f4550a082..d876761a765 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -664,6 +664,10 @@ undefined in the keymaps.
664The argument @var{accept-defaults} controls checking for default 664The argument @var{accept-defaults} controls checking for default
665bindings, as in @code{lookup-key} (above). 665bindings, as in @code{lookup-key} (above).
666 666
667When @var{key} is a vector containing an input event, such as a mouse
668click, @code{key-binding} first looks for the binding in the local
669keymap at the position specified by that event, if any.
670
667When commands are remapped (@pxref{Remapping Commands}), 671When commands are remapped (@pxref{Remapping Commands}),
668@code{key-binding} normally processes command remappings so as to 672@code{key-binding} normally processes command remappings so as to
669returns the remapped command that will actually be executed. However, 673returns the remapped command that will actually be executed. However,