summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2015-01-27 23:55:26 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2015-01-27 23:55:26 +0000
commitbe2d23e58721b7acc68c0ea654a38e5109df2aa2 (patch)
treef914e90ca5f87ebc77a309c930c2d904c15c6be2 /lisp/emacs-lisp/cl.el
parent7e157b25446c5dc11201db4dff256cf7cc2f1611 (diff)
downloademacs-be2d23e58721b7acc68c0ea654a38e5109df2aa2.tar.gz
lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that cl--labels-convert adds (bug#19699)
Diffstat (limited to 'lisp/emacs-lisp/cl.el')
-rw-r--r--lisp/emacs-lisp/cl.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 1cd7bd76b0e..1b204631fb8 100644
--- 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.