(byte-compile-maybe-guarded): Restore code commented out 2007-11-10.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 356f0d7890bb5dacab62d44a1cdc7dac79b11aa3..064a7aeb76867db29fdae74291481e007a346dff 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3562,10 +3562,16 @@ that suppresses all warnings during execution of BODY."
          ;; emacs/xemacs tests have been optimized away, so this is
          ;; not doing anything useful here, is should probably be
          ;; moved to a different place.
-         ;; (byte-compile-warnings
-         ;;  (if (member ,condition '((featurep 'xemacs)
-         ;;                        (not (featurep 'emacs))))
-         ;;      nil byte-compile-warnings))
+         ;; It is doing _something_. If this is commented out, then
+         ;; compiling a file which requires another file which
+         ;; defines a defsubst that uses (featurep 'xemacs) results
+         ;; in a spurious compilation warning about the xemacs code. Eg:
+         ;; (defsubst foo () (if (featurep 'xemacs) (setq foo t)))
+         ;; where foo is a free variable.
+         (byte-compile-warnings
+          (if (member ,condition '((featurep 'xemacs)
+                                   (not (featurep 'emacs))))
+              nil byte-compile-warnings))
          )
      (unwind-protect
         (progn ,@body)