diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-30 05:31:53 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-30 05:31:53 +0000 |
| commit | d6697c02929d3674328557cbf765d249b4aa2a94 (patch) | |
| tree | cabb1a609203575fe24ea2396da8eb9a99bd1968 /lisp/gnus | |
| parent | c665bf4b66a6415b1d34627684b4fa3c8ba0d062 (diff) | |
| download | emacs-d6697c02929d3674328557cbf765d249b4aa2a94.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 30 |
2 files changed, 26 insertions, 14 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1f305f3adeb..f11cff564c3 100644 --- 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 b92ce8616d5..d8ca1877997 100644 --- 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." |