gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6ca94d176000ac705b6527be878f24e38e5ed3ca..d71d546a2c9026f651ed89276071fc50e187dc80 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.
+
 2010-12-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-summary-respool-article): The completion function

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 45fd26c86c03e0e29f8d78a21f4c48d5c7d67e79..fa4bf076a3058f9e705ffa5f7bbefa7c284ff320 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -2037,25 +2037,26 @@ Same as `string-match' except this function does not change the match data."
     (save-match-data
       (string-match regexp string start))))
 
-(if (fboundp 'macroexpand-all)
-    (defalias 'gnus-macroexpand-all 'macroexpand-all)
-  (defun gnus-macroexpand-all (form &optional environment)
-    "Return result of expanding macros at all levels in FORM.
+(eval-and-compile
+  (if (fboundp 'macroexpand-all)
+      (defalias 'gnus-macroexpand-all 'macroexpand-all)
+    (defun gnus-macroexpand-all (form &optional environment)
+      "Return result of expanding macros at all levels in FORM.
 If no macros are expanded, FORM is returned unchanged.
 The second optional arg ENVIRONMENT specifies an environment of macro
 definitions to shadow the loaded ones for use in file byte-compilation."
-    (if (consp form)
-       (let ((idx 1)
-             (len (length (setq form (copy-sequence form))))
-             expanded)
-         (while (< idx len)
-           (setcar (nthcdr idx form) (gnus-macroexpand-all (nth idx form)
-                                                           environment))
-           (setq idx (1+ idx)))
-         (if (eq (setq expanded (macroexpand form environment)) form)
-             form
-           (gnus-macroexpand-all expanded environment)))
-      form)))
+      (if (consp form)
+         (let ((idx 1)
+               (len (length (setq form (copy-sequence form))))
+               expanded)
+           (while (< idx len)
+             (setcar (nthcdr idx form) (gnus-macroexpand-all (nth idx form)
+                                                             environment))
+             (setq idx (1+ idx)))
+           (if (eq (setq expanded (macroexpand form environment)) form)
+               form
+             (gnus-macroexpand-all expanded environment)))
+       form))))
 
 (provide 'gnus-util)