Prevent shadowing declarations in functional compatibility code

Previously the advice check inserted a redundant nil at the beginning
of every function or macro definition. This prevented defun/defmacro
from parsing any declare hints.

1 files changed, 3 insertions, 3 deletions

diff --git a/compat-macs.el b/compat-macs.el
index 41dc3da..f8d0c65 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -145,9 +145,9 @@ attributes (see `compat-generate-common')."
          ;; Advice may use the implicit variable `oldfun', but
          ;; to avoid triggering the byte compiler, we make
          ;; sure the argument is used at least once.
-         ,(and (eq type 'advice) '(ignore oldfun))
-         ;; Insert the actual body now.
-         ,@body))
+         ,@(if (eq type 'advice)
+               (cons '(ignore oldfun) body)
+             body)))
      (lambda (realname version)
        (cond
         ((memq type '(func macro))