(cl-map-keymap): Be careful with aliases.

diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index 1ec500326ff210daceeaedc14c83e243c22e7d47..ac27faba032ed2766fabb4d2802614ae63f808e9 100644 (file)
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -31,6 +31,9 @@
 
 (defalias 'current-time-seconds 'current-time)
 
+;; In case cl-map-keymap is an alias for map-keymap, avoid circular calls.
+(fset 'cl-map-keymap (indirect-function 'cl-map-keymap))
+
 (defun map-keymap (function keymap &optional sort-first)
   "Call FUNCTION for every binding in KEYMAP.
 This does not include bindings inherited from a parent keymap.