[Emacs-diffs] /srv/bzr/emacs/trunk r109934: * lisp/emacs-lisp/byte-run.el (defun): Tweak message. Simplify code.

[Stefan Monnier]

------------------------------------------------------------
revno: 109934
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-07 16:14:55 -0400
message:
  * lisp/emacs-lisp/byte-run.el (defun): Tweak message.  Simplify code.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/byte-run.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-07 14:53:15 +0000
+++ b/lisp/ChangeLog    2012-09-07 20:14:55 +0000
@@ -1,7 +1,11 @@
+2012-09-07  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/byte-run.el (defun): Tweak message.  Simplify code.
+
 2012-09-07  Matt McClure  <address@hidden>  (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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el       2012-08-15 16:29:11 +0000
+++ b/lisp/emacs-lisp/byte-run.el       2012-09-07 20:14:55 +0000
@@ -185,11 +185,10 @@
                    ((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