aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-12-31 08:27:27 +0800
committerLeo Liu2013-12-31 08:27:27 +0800
commitc8d897786d9dcd9ef92f03a55846537ee08122f5 (patch)
tree5642223d4880bfc00be645d5a427f176db7c6d9c
parent9e0bf19a5c222ce74c110180ac3c1beacecd2122 (diff)
downloademacs-c8d897786d9dcd9ef92f03a55846537ee08122f5.tar.gz
emacs-c8d897786d9dcd9ef92f03a55846537ee08122f5.zip
* subr.el (set-temporary-overlay-map): Obsolete alias.
Fixes: debbugs:16305
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67774ed6b70..ee36a71f588 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-12-31 Leo Liu <sdl.web@gmail.com>
2
3 * subr.el (set-temporary-overlay-map): Obsolete alias. (Bug#16305)
4
12013-12-30 Daniel Colascione <dancol@dancol.org> 52013-12-30 Daniel Colascione <dancol@dancol.org>
2 6
3 * term/x-win.el ([XF86WakeUp]): Ignore the XF86WakeUp key instead 7 * term/x-win.el ([XF86WakeUp]): Ignore the XF86WakeUp key instead
diff --git a/lisp/subr.el b/lisp/subr.el
index ab2023bd544..cf90653d2e1 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4266,6 +4266,9 @@ use `called-interactively-p'."
4266 (eq 'add-keymap-witness (nth 1 map)) 4266 (eq 'add-keymap-witness (nth 1 map))
4267 (set symbol tail))))) 4267 (set symbol tail)))))
4268 4268
4269(define-obsolete-function-alias
4270 'set-temporary-overlay-map 'set-transient-map "24.4")
4271
4269(defun set-transient-map (map &optional keep-pred on-exit) 4272(defun set-transient-map (map &optional keep-pred on-exit)
4270 "Set MAP as a temporary keymap taking precedence over other keymaps. 4273 "Set MAP as a temporary keymap taking precedence over other keymaps.
4271Normally, MAP is used only once, to look up the very next key. 4274Normally, MAP is used only once, to look up the very next key.