[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111101: Fixes: debbugs:13316

[Andreas Schwab]

------------------------------------------------------------
revno: 111101
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2012-12-31 20:15:32 +0100
message:
  Fixes: debbugs:13316
  
  * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if
  neither DOCSTRING nor DECL was given.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/byte-run.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-30 03:28:52 +0000
+++ b/lisp/ChangeLog    2012-12-31 19:15:32 +0000
@@ -1,3 +1,8 @@
+2012-12-31  Andreas Schwab  <address@hidden>
+
+       * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if
+       neither DOCSTRING nor DECL was given.  (Bug#13316)
+
 2012-12-30  Glenn Morris  <address@hidden>
 
        * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):

=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el       2012-11-19 20:57:36 +0000
+++ b/lisp/emacs-lisp/byte-run.el       2012-12-31 19:15:32 +0000
@@ -128,12 +128,12 @@
 interpreted according to `macro-declarations-alist'.
 The return value is undefined."
        (if (stringp docstring) nil
-         (if decl (setq body (cons decl body)))
-         (setq decl docstring)
-         (setq docstring nil))
+        (setq body (cons decl body))
+        (setq decl docstring)
+        (setq docstring nil))
        (if (or (null decl) (eq 'declare (car-safe decl))) nil
-         (setq body (cons decl body))
-         (setq decl nil))
+        (setq body (cons decl body))
+        (setq decl nil))
        (if (null body) (setq body '(nil)))
        (if docstring (setq body (cons docstring body)))
        ;; Can't use backquote because it's not defined yet!