Trivial change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3b48c704cc4974b9d3e2c9927334aa2098bad17..84c8c78e7008e0b80370021bbdfba5238daf3b20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-25  Richard Stallman  <rms@gnu.org>
+
+       * subr.el (add-hook): Implement `permanent-local-hook' property.
+
+       * loadhist.el (file-provides, file-requires): Push the filename right.
+
 2008-01-25  Martin Rudalics  <rudalics@gmx.at>
 
        * emacs-lisp/find-func.el (find-library): Wrap search for

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 9e078d04be3a83bd3d91698f115d6e078fcdef66..17da9cc515424633ee06cb3a39828ec1051c9bdc 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2508,11 +2508,12 @@ They are not evaluated unless the assertion fails.  If STRING is
 omitted, a default message listing FORM itself is used."
   (and (or (not (cl-compiling-file))
           (< cl-optimize-speed 3) (= cl-optimize-safety 3))
-       (let ((sargs (and show-args (delq nil (mapcar
-                                             (function
-                                              (lambda (x)
-                                                (and (not (cl-const-expr-p x))
-                                                     x))) (cdr form))))))
+       (let ((sargs (and show-args
+                        (delq nil (mapcar
+                                    (lambda (x)
+                                      (unless (cl-const-expr-p x)
+                                        x))
+                                   (cdr form))))))
         (list 'progn
               (list 'or form
                     (if string