From: Robin Templeton <robin@terpri.org>
Date: Sun, 22 Jun 2014 04:42:07 +0000 (-0400)
Subject: rm lazy macro use
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/b139508b6f9b1cd6828c21d2c82422e2ef5648d0

rm lazy macro use
---

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 0a9a39422d..b9fc8d855d 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -232,14 +232,7 @@ The return value is undefined.
                    ((and (featurep 'cl)
                          (memq (car x)  ;C.f. cl-do-proclaim.
                                '(special inline notinline optimize warn)))
-                    (push (list 'declare x)
-                          (if (stringp docstring)
-                              (if (eq (car-safe (cadr body)) 'interactive)
-                                  (cddr body)
-                                (cdr body))
-                            (if (eq (car-safe (car body)) 'interactive)
-                                (cdr body)
-                              body)))
+                    (setq body (cons (list 'declare x) body))
                     nil)
                    (t (message "Warning: Unknown defun property `%S' in %S"
                                (car x) name)))))