Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-461

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 86)

   - Update from CVS

2005-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (article-display-face): Correct the position in
   which Faces are inserted; use dolist.

2005-06-29  Didier Verna  <didier@xemacs.org>

   * lisp/gnus/gnus-art.el (article-display-face): display faces in correct
   order.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1f305f3adebdaaa1a2cd8074c65a05493a18133f..f11cff564c3498b29a4dc55e80865c6a2d631a96 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (article-display-face): Correct the position in
+       which Faces are inserted; use dolist.
+
+2005-06-29  Didier Verna  <didier@xemacs.org>
+
+       * gnus-art.el (article-display-face): display faces in correct
+       order.
+
 2005-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-nocem.el (gnus-nocem-verifyer): Default to pgg-verify.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b92ce8616d5817be89207f5b956e739a0c0af0e5..d8ca18779974965ffe5d23d3bd8d29b6d2a96c94 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2123,7 +2123,8 @@ unfolded."
       ;; read-only.
       (if (and wash-face-p (memq 'face gnus-article-wash-types))
          (gnus-delete-images 'face)
-       (let (face faces)
+       (let ((from (gnus-article-goto-header "from"))
+             face faces)
          (save-excursion
            (when (and wash-face-p
                       (progn
@@ -2135,19 +2136,20 @@ unfolded."
              (mail-narrow-to-head)
              (while (gnus-article-goto-header "Face")
                (push (mail-header-field-value) faces))))
-         (while (setq face (pop faces))
-           (let ((png (gnus-convert-face-to-png face))
-                 image)
-             (when png
-               (setq image (gnus-create-image png 'png t))
-               (gnus-article-goto-header "from")
-               (when (bobp)
-                 (insert "From: [no `from' set]\n")
-                 (forward-char -17))
-               (gnus-add-wash-type 'face)
-               (gnus-add-image 'face image)
-               (gnus-put-image image nil 'face))))))
-      )))
+         (when faces
+           (unless from
+             (insert "From:")
+             (setq from (point))
+             (insert "[no `from' set]\n"))
+           (dolist (face faces)
+             (let ((png (gnus-convert-face-to-png face))
+                   image)
+               (when png
+                 (setq image (gnus-create-image png 'png t))
+                 (goto-char from)
+                 (gnus-add-wash-type 'face)
+                 (gnus-add-image 'face image)
+                 (gnus-put-image image nil 'face))))))))))
 
 (defun article-display-x-face (&optional force)
   "Look for an X-Face header and display it if present."