From 0f893c3b8ad9163febf6ede12a87e96ba7e063a2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 22 Jun 2001 12:29:04 +0000 Subject: [PATCH] * gnus-art.el (article-display-x-face): Don't gather X-Face fields in `gnus-original-article-buffer'. --- ChangeLog | 5 ++++ lisp/gnus-art.el | 70 +++++++++++++++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48c0b32..48ea742 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-06-22 Katsumi Yamaoka + + * lisp/gnus-art.el (article-display-x-face): Don't gather X-Face + fields in `gnus-original-article-buffer'. + 2001-06-18 Katsumi Yamaoka * lisp/nnshimbun.el (nnshimbun-find-parameter): Undo the last diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 3b72ac1..1117447 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1737,41 +1737,41 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")." from last) (save-restriction (article-narrow-to-head) - (when (and buffer-read-only ;; When type `W f' - (progn - (goto-char (point-min)) - (not (re-search-forward "^X-Face:[\t ]*" nil t))) - (gnus-buffer-live-p gnus-original-article-buffer)) - (with-current-buffer gnus-original-article-buffer - (save-restriction - (article-narrow-to-head) - (while (re-search-forward "^X-Face:" nil t) - (setq x-faces - (concat - (or x-faces "") - (buffer-substring - (match-beginning 0) - (1- (re-search-forward - "^\\($\\|[^ \t]\\)" nil t)))))))) - (if x-faces - (let (point start bface eface buffer-read-only) - (goto-char (point-max)) - (forward-line -1) - (setq bface (get-text-property (gnus-point-at-bol) 'face) - eface (get-text-property (1- (gnus-point-at-eol)) 'face)) - (goto-char (point-max)) - (setq point (point)) - (insert x-faces) - (goto-char point) - (while (looking-at "\\([^:]+\\): *") - (put-text-property (match-beginning 1) (1+ (match-end 1)) - 'face bface) - (setq start (match-end 0)) - (forward-line 1) - (while (looking-at "[\t ]") - (forward-line 1)) - (put-text-property start (point) - 'face eface))))) +;; (when (and buffer-read-only ;; When type `W f' +;; (progn +;; (goto-char (point-min)) +;; (not (re-search-forward "^X-Face:[\t ]*" nil t))) +;; (gnus-buffer-live-p gnus-original-article-buffer)) +;; (with-current-buffer gnus-original-article-buffer +;; (save-restriction +;; (article-narrow-to-head) +;; (while (re-search-forward "^X-Face:" nil t) +;; (setq x-faces +;; (concat +;; (or x-faces "") +;; (buffer-substring +;; (match-beginning 0) +;; (1- (re-search-forward +;; "^\\($\\|[^ \t]\\)" nil t)))))))) +;; (if x-faces +;; (let (point start bface eface buffer-read-only) +;; (goto-char (point-max)) +;; (forward-line -1) +;; (setq bface (get-text-property (gnus-point-at-bol) 'face) +;; eface (get-text-property (1- (gnus-point-at-eol)) 'face)) +;; (goto-char (point-max)) +;; (setq point (point)) +;; (insert x-faces) +;; (goto-char point) +;; (while (looking-at "\\([^:]+\\): *") +;; (put-text-property (match-beginning 1) (1+ (match-end 1)) +;; 'face bface) +;; (setq start (match-end 0)) +;; (forward-line 1) +;; (while (looking-at "[\t ]") +;; (forward-line 1)) +;; (put-text-property start (point) +;; 'face eface))))) (goto-char (point-min)) (setq from (message-fetch-field "from")) (goto-char (point-min)) -- 1.7.10.4