* lisp/emacs-lisp/byte-run.el (defun): Tweak message. Simplify code.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efdc0b80d13f618546bd3142d8da7daee8871d16..052b85ef757fb170fff87b57a1ecd740f8f627c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2012-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/byte-run.el (defun): Tweak message.  Simplify code.
+
 2012-09-07  Matt McClure  <mlm@aya.yale.edu>  (tiny change)
 
-       * progmodes/python.el (python-shell-send-string): When
-       default-directory is remote, create temp file on remote
+       * progmodes/python.el (python-shell-send-string):
+       When default-directory is remote, create temp file on remote
        filesystem.
        (python-shell-send-file): When file is remote, pass local view of
        file paths to remote Python interpreter.  (Bug#12340)
@@ -15,8 +19,8 @@
 
        * subr.el (read-char-choice): Allow quitting via ESC ESC.
 
-       * userlock.el (ask-user-about-supersession-threat): Use
-       read-char-choice (Bug#12093).
+       * userlock.el (ask-user-about-supersession-threat):
+       Use read-char-choice (Bug#12093).
 
 2012-09-07  Chong Yidong  <cyd@gnu.org>
 

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 9b66c8ffd6063ace66d0325bab053433b9984eca..d1382f42b1953a6361d3329115b327e73c4ad2f5 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -185,11 +185,10 @@ The return value is undefined.
                    ((and (featurep 'cl)
                          (memq (car x)  ;C.f. cl-do-proclaim.
                                '(special inline notinline optimize warn)))
-                    (if (null (stringp docstring))
-                        (push (list 'declare x) body)
-                      (setcdr body (cons (list 'declare x) (cdr body))))
+                    (push (list 'declare x)
+                          (if (stringp docstring) (cdr body) body))
                     nil)
-                   (t (message "Warning: Unknown defun property %S in %S"
+                   (t (message "Warning: Unknown defun property `%S' in %S"
                                (car x) name)))))
                    decls))
           (def (list 'defalias