From 42640eb0732a3fb1ae27381ae91d562db2fb9572 Mon Sep 17 00:00:00 2001 From: teranisi Date: Sat, 11 Dec 2004 15:51:41 +0000 Subject: [PATCH] * wl-mime.el (wl-draft-yank-current-message-entity): Switch to no-mime following method according to wl-message-display-type property. (wl-mime-preview-follow-no-mime): Use wl-message-mime-analysis-p. * wl-message.el (wl-message-display-internal): Put wl-message-display-type property on message buffer. * wl-message.el (wl-message-mime-analysis-p): Fixed misspelling. (wl-message-display-internal): Ditto; * wl-summary.el (wl-summary-toggle-mime): Ditto. --- wl/ChangeLog | 15 +++++++++++++++ wl/wl-message.el | 9 ++++++--- wl/wl-mime.el | 13 +++++++------ wl/wl-summary.el | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index e59776d..11bb7c2 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,18 @@ +2004-12-12 Yuuichi Teranishi + + * wl-mime.el (wl-draft-yank-current-message-entity): + Switch to no-mime following method according to wl-message-display-type + property. + (wl-mime-preview-follow-no-mime): Use wl-message-mime-analysis-p. + + * wl-message.el (wl-message-display-internal): + Put wl-message-display-type property on message buffer. + + * wl-message.el (wl-message-mime-analysis-p): Fixed misspelling. + (wl-message-display-internal): Ditto; + + * wl-summary.el (wl-summary-toggle-mime): Ditto. + 2004-12-11 Hiroya Murata * wl-message.el (wl-message-make-display-type): New function. diff --git a/wl/wl-message.el b/wl/wl-message.el index 8d654c3..4d1f553 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -430,7 +430,7 @@ Returns non-nil if bottom of message." (defun wl-message-display-type-property (display-type prop) (plist-get (get display-type 'wl-message-display-type) prop)) -(defun wl-message-mime-analysys-p (display-type &optional header-or-body) +(defun wl-message-mime-analysis-p (display-type &optional header-or-body) (let ((mode (wl-message-display-type-property display-type :mime))) (case header-or-body (header @@ -576,7 +576,7 @@ Returns non-nil if bottom of message." (setq wl-message-buffer-require-all-header (wl-message-display-all-header-p display-type)) (prog1 - (if (wl-message-mime-analysys-p display-type) + (if (wl-message-mime-analysis-p display-type) (elmo-mime-message-display folder number (current-buffer) (wl-message-get-original-buffer) @@ -585,7 +585,7 @@ Returns non-nil if bottom of message." unread (wl-message-define-keymap)) (let* ((elmo-mime-display-header-analysis - (wl-message-mime-analysys-p display-type 'header)) + (wl-message-mime-analysis-p display-type 'header)) (wl-highlight-x-face-function (and elmo-mime-display-header-analysis wl-highlight-x-face-function))) @@ -598,6 +598,9 @@ Returns non-nil if bottom of message." (wl-message-define-keymap)) (let (buffer-read-only) (wl-highlight-message (point-min) (point-max) t))))) + (let (buffer-read-only) + (put-text-property (point-min) (point-max) + 'wl-message-display-type display-type)) (run-hooks 'wl-message-display-internal-hook) (setq buffer-read-only t)))) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index cde15e6..6527365 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -69,18 +69,18 @@ has Non-nil value\)" (cond ((wl-region-exists-p) (wl-mime-preview-follow-current-region)) - ((not (eq (get-text-property (point-min) - 'wl-message-display-mime-mode) - 'mime)) + ((not (wl-message-mime-analysis-p + (get-text-property (point-min) + 'wl-message-display-type))) (wl-mime-preview-follow-no-mime (get-text-property (point-min) - 'wl-message-display-mime-mode))) + 'wl-message-display-type))) (t (mime-preview-follow-current-entity))))) (error "No message.")))) ;; modified mime-preview-follow-current-entity from mime-view.el -(defun wl-mime-preview-follow-no-mime (display-mode) +(defun wl-mime-preview-follow-no-mime (display-type) "Write follow message to current message, without mime. It calls following-method selected from variable `mime-preview-following-method-alist'." @@ -102,7 +102,8 @@ It calls following-method selected from variable (insert-buffer-substring the-buf beg end) (goto-char (point-min)) ;; Insert all headers. - (let ((elmo-mime-display-header-analysis (not (eq display-mode 'as-is)))) + (let ((elmo-mime-display-header-analysis + (wl-message-mime-analysis-p display-type))) (elmo-mime-insert-sorted-header entity)) (let ((f (cdr (assq mode mime-preview-following-method-alist)))) (if (functionp f) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 8fb91af..1eaf098 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -4441,7 +4441,7 @@ If ARG is numeric number, decode message as following: ;; Specify coding-system (doesn't change the MIME mode). (setq elmo-mime-display-as-is-coding-system (if (and arg - (not (wl-message-mime-analysys-p + (not (wl-message-mime-analysis-p (wl-summary-message-display-type)))) (or (read-coding-system "Coding system: ") elmo-mime-display-as-is-coding-system) -- 1.7.10.4