Fixes: debbugs:13316

* emacs-lisp/byte-run.el (defmacro): Don't lose final nil if
neither DOCSTRING nor DECL was given.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84e0ec4a095282fd54e742af4a65c14f4d2d2faa..0bf336cfbe13a81ad6a91b664b3e8ab273b6d0be 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * 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  <rgm@gnu.org>
 
        * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 544b64bc3a6a7f3db3ade1b84954b5940733c6e0..0cbf2616ba2c914c4a2975ac4481d35d9bc5ca5a 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -128,12 +128,12 @@ DECLS is a list of elements of the form (PROP . VALUES).  These are
 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!