* lisp/emacs-lisp/cl.el (cl--function-convert): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90681c806565693a96acc94889b3419794755d8d..ddad9d430b8ba89b0aeba8a389085dad0c730089 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl.el (cl--function-convert): Simplify.
+
 2015-01-28  Tassilo Horn  <tsdh@gnu.org>
 
        * textmodes/reftex.el (reftex-syntax-table-for-bib): Give ( and )
@@ -11,8 +15,8 @@
        python.el: New non-global state dependent indentation engine.
        (Bug#18319, Bug#19595)
 
-       * progmodes/python.el (python-syntax-comment-or-string-p): Accept
-       PPSS as argument.
+       * progmodes/python.el (python-syntax-comment-or-string-p):
+       Accept PPSS as argument.
        (python-syntax-closing-paren-p): New function.
        (python-indent-current-level)
        (python-indent-levels): Mark obsolete.
@@ -30,8 +34,8 @@
 
        * subr.el (posnp): Correct docstring of `posnp'.
        (posn-col-row): Make it work with all mouse position objects.
-       * textmodes/artist.el (artist-mouse-draw-continously): Cancel
-       timers if an error occurs during continuous drawing.  (Bug#6130)
+       * textmodes/artist.el (artist-mouse-draw-continously):
+       Cancel timers if an error occurs during continuous drawing.  (Bug#6130)
 
 2015-01-20  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 1b204631fb8ee9ab2a376dc2bf9f843051e20999..5da1cea6bb3a97c1ed3397f80287979739721e04 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -376,10 +376,7 @@ The two cases that are handled are:
           (setq cl--function-convert-cache (cons newf res))
           res))))
    (t
-    (setq cl--labels-convert-cache cl--function-convert-cache)
-    (prog1
-       (cl--labels-convert f)
-      (setq cl--function-convert-cache cl--labels-convert-cache)))))
+    (cl--labels-convert f))))
 
 (defmacro lexical-let (bindings &rest body)
   "Like `let', but lexically scoped.