[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110865: * lisp/subr.el (set-temporary-overlay-map): Doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 110865
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-11-14 00:29:25 -0800
message:
  * lisp/subr.el (set-temporary-overlay-map): Doc fix.
  
  * etc/NEWS: Related edit.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-11-13 08:14:15 +0000
+++ b/etc/NEWS  2012-11-14 08:29:25 +0000
@@ -932,7 +932,9 @@
 *** `function-get' fetches a function property, following aliases.
 +++
 *** `posnp' tests if an object is a `posn'.
-*** `set-temporary-overlay-map' sets up a temporary overlay map.
+
+*** `set-temporary-overlay-map' sets up a temporary keymap that
+takes precedence over most other maps for a short while (normally one key).
 +++
 *** `system-users' returns the user names on the system.
 +++

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-13 07:40:07 +0000
+++ b/lisp/ChangeLog    2012-11-14 08:29:25 +0000
@@ -1,3 +1,7 @@
+2012-11-14  Glenn Morris  <address@hidden>
+
+       * subr.el (set-temporary-overlay-map): Doc fix.
+
 2012-11-13  Martin Rudalics  <address@hidden>
 
        * window.el (record-window-buffer)

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-10-27 05:03:52 +0000
+++ b/lisp/subr.el      2012-11-14 08:29:25 +0000
@@ -3960,11 +3960,16 @@
   (put symbol 'hookvar (or hookvar 'mail-send-hook)))
 
 (defun set-temporary-overlay-map (map &optional keep-pred)
-  "Set MAP as a temporary overlay map.
-When KEEP-PRED is `t', using a key from the temporary keymap
-leaves this keymap activated.  KEEP-PRED can also be a function,
-which will have the same effect when it returns `t'.
-When KEEP-PRED is nil, the temporary keymap is used only once."
+  "Set MAP as a temporary keymap taking precedence over most other keymaps.
+Note that this does NOT take precedence over the \"overriding\" maps
+`overriding-terminal-local-map' and `overriding-local-map' (or the
+`keymap' text property).  Unlike those maps, if no match for a key is
+found in MAP, the normal key lookup sequence then continues.
+
+Normally, MAP is used only once.  If the optional argument
+KEEP-PRED is `t', MAP stays active if a key from MAP is used.
+KEEP-PRED can also be a function of no arguments: if it returns
+non-nil then MAP stays active."
   (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map"))
          (overlaysym (make-symbol "t"))
          (alist (list (cons overlaysym map)))