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

[gnus] / lisp / gnus-util.el

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 4e4aab4..d710357 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -288,7 +288,10 @@ Uses `gnus-extract-address-components'."
       (if (not end)
          (setq start nil)
        (when value
-         (push (list start end value) regions))
+         (push (list (set-marker (make-marker) start)
+                     (set-marker (make-marker) end)
+                     value)
+               regions))
        (setq start (next-single-property-change start prop))))
     (nreverse regions)))
 
@@ -2031,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