* lisp/emacs-lisp/cl-lib.el (cl-values, cl-values-list): Fix up last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c707d3a444d783bfd77f7e3de37755d41df81b83..2f4a5afe03839843b8a8d96380b43b29b3eb06d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl-lib.el (cl-values, cl-values-list): Fix up last change.
+
 2012-06-04  Chong Yidong  <cyd@gnu.org>
 
-       * image.el (imagemagick-types-inhibit): Revert last change.  Add
-       INFO and M.
+       * image.el (imagemagick-types-inhibit): Revert last change.
+       Add INFO and M.
        (imagemagick-enabled-types): Remove CIN and EPS*.
 
 2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index bb3fc5fde60d207caf87684f6b64bc2734b29c67..0dd8c9e15696dca6babe5731f60abb5218feba21 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -227,6 +227,7 @@ The arguments of `cl-values' are the values
 that the containing function should return.
 
 \(fn &rest VALUES)")
+(put 'cl-values 'byte-optimizer 'byte-compile-inline-expand)
 
 (defalias 'cl-values-list #'identity
   "Return multiple values, Common Lisp style, taken from a list.
@@ -234,6 +235,7 @@ LIST specifies the list of values
 that the containing function should return.
 
 \(fn LIST)")
+(put 'cl-values-list 'byte-optimizer 'byte-compile-inline-expand)
 
 (defsubst cl-multiple-value-list (expression)
   "Return a list of the multiple values produced by EXPRESSION.