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 @@
+2013-12-31  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (set-temporary-overlay-map): Obsolete alias.  (Bug#16305)
+
 2013-12-30  Daniel Colascione  <dancol@dancol.org>
 
         * 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'."
            (eq 'add-keymap-witness (nth 1 map))
            (set symbol tail)))))
 
+(define-obsolete-function-alias
+  'set-temporary-overlay-map 'set-transient-map "24.4")
+
 (defun set-transient-map (map &optional keep-pred on-exit)
   "Set MAP as a temporary keymap taking precedence over other keymaps.
 Normally, MAP is used only once, to look up the very next key.