[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master be2d23e: lisp/emacs-lisp/cl.el (cl--function-conver
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] master be2d23e: lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that cl--labels-convert adds (bug#19699) |
Date: |
Tue, 27 Jan 2015 23:55:27 +0000 |
branch: master
commit be2d23e58721b7acc68c0ea654a38e5109df2aa2
Author: Katsumi Yamaoka <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>
lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that
cl--labels-convert adds (bug#19699)
---
lisp/ChangeLog | 5 +++++
lisp/emacs-lisp/cl.el | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 182d770..816a8cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-27 Katsumi Yamaoka <address@hidden>
+
+ * emacs-lisp/cl.el (cl--function-convert):
+ Merge cache that cl--labels-convert adds (bug#19699).
+
2015-01-27 Ivan Shmakov <address@hidden>
* tar-mode.el: Allow for adding new archive members. (Bug#19274)
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 1cd7bd7..1b20463 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master be2d23e: lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that cl--labels-convert adds (bug#19699),
Katsumi Yamaoka <=