[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.80 emacs/lisp/gnus/gnus-art.el:1.81
*** emacs/lisp/gnus/gnus-art.el:1.80    Fri Jun 24 08:57:12 2005
--- emacs/lisp/gnus/gnus-art.el Thu Jun 30 05:31:53 2005
***************
*** 2123,2129 ****
        ;; read-only.
        (if (and wash-face-p (memq 'face gnus-article-wash-types))
          (gnus-delete-images 'face)
!       (let (face faces)
          (save-excursion
            (when (and wash-face-p
                       (progn
--- 2123,2130 ----
        ;; read-only.
        (if (and wash-face-p (memq 'face gnus-article-wash-types))
          (gnus-delete-images 'face)
!       (let ((from (gnus-article-goto-header "from"))
!             face faces)
          (save-excursion
            (when (and wash-face-p
                       (progn
***************
*** 2135,2153 ****
              (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))))))
!       )))
  
  (defun article-display-x-face (&optional force)
    "Look for an X-Face header and display it if present."
--- 2136,2155 ----
              (mail-narrow-to-head)
              (while (gnus-article-goto-header "Face")
                (push (mail-header-field-value) faces))))
!         (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."