lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that cl--labels-convert adds (bug#19699)

be2d23e5 · Katsumi Yamaoka · 7e157b25 · be2d23e5 · be2d23e5
Commit be2d23e5 authored Jan 27, 2015 by Katsumi Yamaoka
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/emacs-lisp/cl.el lisp/emacs-lisp/cl.el +3 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2015-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* emacs-lisp/cl.el (cl--function-convert):
+	Merge cache that cl--labels-convert adds (bug#19699).
+
 2015-01-27  Ivan Shmakov  <ivan@siamics.net>

 	* tar-mode.el: Allow for adding new archive members.  (Bug#19274)

--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -377,7 +377,9 @@ The two cases that are handled are:
          res))))
   (t
    (setq cl--labels-convert-cache cl--function-convert-cache)
-    (cl--labels-convert f))))
+    (prog1
+	(cl--labels-convert f)
+      (setq cl--function-convert-cache cl--labels-convert-cache)))))

 (defmacro lexical-let (bindings &rest body)
  "Like `let', but lexically scoped.