diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2015-01-27 23:55:26 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2015-01-27 23:55:26 +0000 |
| commit | be2d23e58721b7acc68c0ea654a38e5109df2aa2 (patch) | |
| tree | f914e90ca5f87ebc77a309c930c2d904c15c6be2 | |
| parent | 7e157b25446c5dc11201db4dff256cf7cc2f1611 (diff) | |
| download | emacs-be2d23e58721b7acc68c0ea654a38e5109df2aa2.tar.gz | |
lisp/emacs-lisp/cl.el (cl--function-convert): Merge cache that cl--labels-convert adds (bug#19699)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 182d7705bb6..816a8cb6b43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +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) 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. |