(cl-old-mapc): Fix definition.

(cl-mapc): Rename from mapc.  Fix the funcall.

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 505fa2cc3d096ebda420aa28a61e5a0b6b7a2a91..79b6306bfc5390e4c05226518d837aecb1f6b7e1 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -152,14 +152,15 @@ the elements themselves."
        (setq cl-list (cdr cl-list)))
       (nreverse cl-res))))
 
-(defvar cl-old-mapc (symbol-function 'mapc))
+(defvar cl-old-mapc (prog1 (symbol-function 'mapc)
+                     (defalias 'mapc 'cl-mapc)))
 
-(defun mapc (cl-func cl-seq &rest cl-rest)
+(defun cl-mapc (cl-func cl-seq &rest cl-rest)
   "Like `mapcar', but does not accumulate values returned by the function."
   (if cl-rest
       (progn (apply 'map nil cl-func cl-seq cl-rest)
             cl-seq)
-    (funcall #'cl-old-mapc cl-func cl-seq)))
+    (funcall cl-old-mapc cl-func cl-seq)))
 
 (defun mapl (cl-func cl-list &rest cl-rest)
   "Like `maplist', but does not accumulate values returned by the function."