summaryrefslogtreecommitdiff
path: root/lispref/keymaps.texi
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2007-06-25 20:53:48 +0000
committerDavid Kastrup <dak@gnu.org>2007-06-25 20:53:48 +0000
commitc5c91f69008bdc533ffdbd491417bed275790834 (patch)
tree5e736796a50810bd74181758cec1f0fd9b9e2f9c /lispref/keymaps.texi
parent6d67ea741ec15c33b29fb56dc7ead2e9c5d3ae70 (diff)
downloademacs-c5c91f69008bdc533ffdbd491417bed275790834.tar.gz
* keymaps.texi (Active Keymaps): Document new POSITION argument of
`current-active-maps'. * keymap.c (Fcurrent_active_maps): Add `position' argument. (Fwhere_is_internal): Adjust call to `current-active-maps' to cater for additional parameter. * keymap.h: Adjust number of parameters to `current-active-maps'. * doc.c (Fsubstitute_command_keys): Adjust call of `current-active-maps'.
Diffstat (limited to 'lispref/keymaps.texi')
-rw-r--r--lispref/keymaps.texi9
1 files changed, 6 insertions, 3 deletions
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 400a2c38240..bf20680dd81 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -655,12 +655,15 @@ events within @code{read-key-sequence}. @xref{Translation Keymaps}.
@xref{Standard Keymaps}, for a list of standard keymaps.
-@defun current-active-maps &optional olp
+@defun current-active-maps &optional olp position
This returns the list of active keymaps that would be used by the
command loop in the current circumstances to look up a key sequence.
Normally it ignores @code{overriding-local-map} and
-@code{overriding-terminal-local-map}, but if @var{olp} is
-non-@code{nil} then it pays attention to them.
+@code{overriding-terminal-local-map}, but if @var{olp} is non-@code{nil}
+then it pays attention to them. @var{position} can optionally be either
+an event position as returned by @code{event-start} or a buffer
+position, and may change the keymaps as described for
+@code{key-binding}.
@end defun
@defun key-binding key &optional accept-defaults no-remap position