Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.81 emacs/lisp/gnus/gnus-art.el:1.82
*** emacs/lisp/gnus/gnus-art.el:1.81 Thu Jun 30 05:31:53 2005
--- emacs/lisp/gnus/gnus-art.el Sat Jul 2 02:53:20 2005
***************
*** 2123,2150 ****
;; 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
! (goto-char (point-min))
! (not (re-search-forward "^Face:[\t ]*" nil t)))
! (gnus-buffer-live-p gnus-original-article-buffer))
(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
(setq image (gnus-create-image png 'png t))
(goto-char from)
(gnus-add-wash-type 'face)
--- 2123,2148 ----
;; read-only.
(if (and wash-face-p (memq 'face gnus-article-wash-types))
(gnus-delete-images 'face)
! (let (face faces from)
! (save-current-buffer
(when (and wash-face-p
! (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
! (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 (gnus-create-image png 'png t))
(goto-char from)
(gnus-add-wash-type 'face)
***************
*** 2166,2178 ****
(gnus-delete-images 'xface)
;; Display X-Faces.
(let (x-faces from face)
! (save-excursion
(when (and wash-face-p
! (progn
! (goto-char (point-min))
! (not (re-search-forward
! "^X-Face\\(-[0-9]+\\)?:[\t ]*" nil t)))
! (gnus-buffer-live-p gnus-original-article-buffer))
;; If type `W f', use gnus-original-article-buffer,
;; otherwise use the current buffer because displaying
;; RFC822 parts calls this function too.
--- 2164,2173 ----
(gnus-delete-images 'xface)
;; Display X-Faces.
(let (x-faces from face)
! (save-current-buffer
(when (and wash-face-p
! (gnus-buffer-live-p gnus-original-article-buffer)
! (not (re-search-forward "^X-Face:[\t ]*" nil t)))
;; If type `W f', use gnus-original-article-buffer,
;; otherwise use the current buffer because displaying
;; RFC822 parts calls this function too.
***************
*** 2186,2220 ****
;; single external face.
(when (stringp gnus-article-x-face-command)
(setq x-faces (list (car x-faces))))
! (while (and (setq face (pop x-faces))
! gnus-article-x-face-command
! (or force
! ;; Check whether this face is censored.
! (not gnus-article-x-face-too-ugly)
! (and gnus-article-x-face-too-ugly from
! (not (string-match gnus-article-x-face-too-ugly
! from)))))
! ;; We display the face.
! (cond ((stringp gnus-article-x-face-command)
! ;; The command is a string, so we interpret the command
! ;; as a, well, command, and fork it off.
! (let ((process-connection-type nil))
! (gnus-set-process-query-on-exit-flag
! (start-process
! "article-x-face" nil shell-file-name
! shell-command-switch gnus-article-x-face-command)
! nil)
! (with-temp-buffer
! (insert face)
! (process-send-region "article-x-face"
! (point-min) (point-max)))
! (process-send-eof "article-x-face")))
! ((functionp gnus-article-x-face-command)
! ;; The command is a lisp function, so we call it.
! (funcall gnus-article-x-face-command face))
! (t
! (error "%s is not a function"
! gnus-article-x-face-command)))))))))
(defun article-decode-mime-words ()
"Decode all MIME-encoded words in the article."
--- 2181,2216 ----
;; single external face.
(when (stringp gnus-article-x-face-command)
(setq x-faces (list (car x-faces))))
! (when (and x-faces
! gnus-article-x-face-command
! (or force
! ;; Check whether this face is censored.
! (not gnus-article-x-face-too-ugly)
! (and from
! (not (string-match gnus-article-x-face-too-ugly
! from)))))
! (while (setq face (pop x-faces))
! ;; We display the face.
! (cond ((stringp gnus-article-x-face-command)
! ;; The command is a string, so we interpret the command
! ;; as a, well, command, and fork it off.
! (let ((process-connection-type nil))
! (gnus-set-process-query-on-exit-flag
! (start-process
! "article-x-face" nil shell-file-name
! shell-command-switch gnus-article-x-face-command)
! nil)
! (with-temp-buffer
! (insert face)
! (process-send-region "article-x-face"
! (point-min) (point-max)))
! (process-send-eof "article-x-face")))
! ((functionp gnus-article-x-face-command)
! ;; The command is a lisp function, so we call it.
! (funcall gnus-article-x-face-command face))
! (t
! (error "%s is not a function"
! gnus-article-x-face-command))))))))))
(defun article-decode-mime-words ()
"Decode all MIME-encoded words in the article."
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
