(gnus-faces-at): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a8931a..c28c2a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-util.el (gnus-faces-at): Simplify.
+
 2003-02-13  Teodor Zlatanov  <tzz@bwh.harvard.edu>
 
        * spam.el (spam-ham-move-routine) 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index b03b8bc..423b287 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -696,23 +696,18 @@ and `print-level' to nil."
           b (setq b (next-single-property-change b 'gnus-face nil end))
           prop val))))))
 
-(defmacro gnus-faces-at (pos)
-  "Return a list of faces at POS."
+(defmacro gnus-faces-at (position)
+  "Return a list of faces at POSITION."
   (if (featurep 'xemacs)
-      `(let* ((pos ,pos)
-             (faces (list (get-text-property pos 'face))))
-        (mapcar-extents
-         (lambda (extent)
-           (pushnew (extent-property extent 'face) faces))
-         nil (current-buffer) pos pos)
-        (delq nil faces))
-    `(let* ((pos ,pos)
-           (faces (list (get-text-property pos 'face)))
-           (overlays (overlays-at pos)))
-       (while overlays
-        (pushnew (plist-get (overlay-properties (pop overlays)) 'face)
-                 faces))
-       (delq nil faces))))
+      `(let ((pos ,position))
+        (mapcar-extents 'extent-face
+                        nil (current-buffer) pos pos nil 'face))
+    `(let ((pos ,position))
+       (delq nil (cons (get-text-property pos 'face)
+                      (mapcar
+                       (lambda (overlay)
+                         (overlay-get overlay 'face))
+                       (overlays-at pos)))))))
 
 ;;; Protected and atomic operations.  dmoore@ucsd.edu 21.11.1996
 ;;; The primary idea here is to try to protect internal datastructures