From 09ef42c9b5534baacf91b9ef11eeddd3f46156bb Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 1 Jul 2005 08:53:51 +0000 Subject: [PATCH] Synch to No Gnus 200507010853. --- lisp/ChangeLog | 4 ++++ lisp/gnus-art.el | 28 +++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b191230..516225a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-07-01 Katsumi Yamaoka + + * gnus-art.el (article-display-face): Improve the efficiency. + 2005-06-30 Katsumi Yamaoka * gnus-art.el (article-display-face): Correct the position in diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 930f752..eda2444 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2283,28 +2283,26 @@ unfolded." ;; 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 + (let (face faces from) + (save-current-buffer (when (and wash-face-p - (progn - (goto-char (point-min)) - (not (re-search-forward "^Face:[\t ]*" nil t))) - (gnus-buffer-live-p gnus-original-article-buffer)) + (gnus-buffer-live-p gnus-original-article-buffer) + (not (re-search-forward "^Face:[\t ]*" nil t))) (set-buffer gnus-original-article-buffer)) (save-restriction (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 + (goto-char (point-min)) + (let ((from (gnus-article-goto-header "from")) + png image) + (unless from + (insert "From:") + (setq from (point)) + (insert "[no `from' set]\n")) + (while faces + (when (setq png (gnus-convert-face-to-png (pop faces))) (setq image (apply 'gnus-create-image png 'png t (cdr (assq 'png gnus-face-properties-alist)))) -- 1.7.10.4