aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-11-14 00:29:25 -0800
committerGlenn Morris2012-11-14 00:29:25 -0800
commite0ea8060060193f66c776b513e3da731765fc38d (patch)
tree8b5f032ff743449f634805efcff40f3928180681 /lisp
parente4e9830bd9b59f5988e2e6d0774af0707f4d9182 (diff)
downloademacs-e0ea8060060193f66c776b513e3da731765fc38d.tar.gz
emacs-e0ea8060060193f66c776b513e3da731765fc38d.zip
* lisp/subr.el (set-temporary-overlay-map): Doc fix.
* etc/NEWS: Related edit.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el15
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c13ef1289f8..80ae61df8c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-11-14 Glenn Morris <rgm@gnu.org>
2
3 * subr.el (set-temporary-overlay-map): Doc fix.
4
12012-11-13 Martin Rudalics <rudalics@gmx.at> 52012-11-13 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (record-window-buffer) 7 * window.el (record-window-buffer)
diff --git a/lisp/subr.el b/lisp/subr.el
index d328b7cddf5..d02b889ec44 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3960,11 +3960,16 @@ The properties used on SYMBOL are `composefunc', `sendfunc',
3960 (put symbol 'hookvar (or hookvar 'mail-send-hook))) 3960 (put symbol 'hookvar (or hookvar 'mail-send-hook)))
3961 3961
3962(defun set-temporary-overlay-map (map &optional keep-pred) 3962(defun set-temporary-overlay-map (map &optional keep-pred)
3963 "Set MAP as a temporary overlay map. 3963 "Set MAP as a temporary keymap taking precedence over most other keymaps.
3964When KEEP-PRED is `t', using a key from the temporary keymap 3964Note that this does NOT take precedence over the \"overriding\" maps
3965leaves this keymap activated. KEEP-PRED can also be a function, 3965`overriding-terminal-local-map' and `overriding-local-map' (or the
3966which will have the same effect when it returns `t'. 3966`keymap' text property). Unlike those maps, if no match for a key is
3967When KEEP-PRED is nil, the temporary keymap is used only once." 3967found in MAP, the normal key lookup sequence then continues.
3968
3969Normally, MAP is used only once. If the optional argument
3970KEEP-PRED is `t', MAP stays active if a key from MAP is used.
3971KEEP-PRED can also be a function of no arguments: if it returns
3972non-nil then MAP stays active."
3968 (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map")) 3973 (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map"))
3969 (overlaysym (make-symbol "t")) 3974 (overlaysym (make-symbol "t"))
3970 (alist (list (cons overlaysym map))) 3975 (alist (list (cons overlaysym map)))