gnus-util.el (gnus-macroexpand-all): New function.

gnus-sum.el (gnus-summary-line-format-alist): Use gnus-macroexpand-all instead of macroexpand-all that is unavailable in XEmacs.

1 files changed, 18 insertions, 0 deletions

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 9deedbeb010..d71035754a7 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -2034,6 +2034,24 @@ 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)
+    "Return result of expanding macros at all levels in FORM.
+If no macros are expanded, FORM is returned unchanged."
+    (if (consp form)
+	(let ((idx 1)
+	      (len (length form))
+	      elem expanded)
+	  (while (< idx len)
+	    (when (consp (setq elem (nth idx form)))
+	      (setcar (nthcdr idx form) (gnus-macroexpand-all elem)))
+	    (setq idx (1+ idx)))
+	  (if (eq (setq expanded (macroexpand form)) form)
+	      form
+	    (gnus-macroexpand-all expanded)))
+      form)))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here