Synch up with main trunk, and prepare the release 2.12.0.

[elisp/wanderlust.git] / wl / wl-message.el

diff --git a/wl/wl-message.el b/wl/wl-message.el
index a97fdc2..1592ddc 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -338,15 +338,18 @@ Returns non-nil if bottom of message."
   (setq mode-name "Message"))
 
 (defun wl-message-exit ()
-  "Move to summary buffer."
+  "Move to summary buffer or mother buffer."
   (interactive)
-  (let (summary-buf summary-win)
-    (if (setq summary-buf wl-message-buffer-cur-summary-buffer)
-       (if (setq summary-win (get-buffer-window summary-buf))
-           (select-window summary-win)
-         (switch-to-buffer summary-buf)
-         (wl-message-select-buffer wl-message-buffer)
-         (select-window (get-buffer-window summary-buf))))
+  (let (summary-buf summary-win mother-buffer)
+    (cond ((setq summary-buf wl-message-buffer-cur-summary-buffer)
+          (if (setq summary-win (get-buffer-window summary-buf))
+              (select-window summary-win)
+            (switch-to-buffer summary-buf)
+            (wl-message-select-buffer wl-message-buffer)
+            (select-window (get-buffer-window summary-buf))))
+         ((setq mother-buffer mime-mother-buffer)
+          (kill-buffer (current-buffer))
+          (switch-to-buffer mother-buffer)))
     (run-hooks 'wl-message-exit-hook)))
 
 (defun wl-message-toggle-disp-summary ()
@@ -415,6 +418,35 @@ Returns non-nil if bottom of message."
               (nth 3 entry) (match-string (nth 4 entry))))
            (goto-char end)))))))
 
+;; display-type object definition.
+(defun wl-message-make-display-type (mime header)
+  (let (symbol)
+    (prog1
+       (setq symbol (intern (format "%s-%s-header" mime header)))
+      (put symbol
+          'wl-message-display-type
+          (list :mime mime :header header)))))
+
+(defun wl-message-display-type-property (display-type prop)
+  (plist-get (get display-type 'wl-message-display-type) prop))
+
+(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
+       (memq mode '(mime header-only)))
+      (t
+       (eq mode 'mime)))))
+
+(defun wl-message-display-all-header-p (display-type)
+  (eq (wl-message-display-type-property display-type :header) 'all))
+
+(defun wl-message-buffer-display-type (&optional message-buffer)
+  (if message-buffer
+      (with-current-buffer message-buffer
+       wl-message-buffer-cur-display-type)
+    wl-message-buffer-cur-display-type))
+
 (defun wl-message-redisplay (folder number display-type &optional force-reload)
   (let* ((default-mime-charset wl-mime-charset)
         (buffer-read-only nil)
@@ -481,7 +513,8 @@ Returns non-nil if bottom of message."
     (when (re-search-forward "^$" nil t)
       (wl-message-add-buttons-to-header (point-min) (point))
       (wl-message-add-buttons-to-body (point) (point-max)))
-    (when wl-message-use-header-narrowing
+    (when (and wl-message-use-header-narrowing
+              (not (wl-message-display-all-header-p display-type)))
       (wl-message-header-narrowing))
     (goto-char (point-min))
     (ignore-errors (run-hooks 'wl-message-redisplay-hook))
@@ -545,27 +578,31 @@ Returns non-nil if bottom of message."
                                           &optional force-reload unread)
   (let ((default-mime-charset wl-mime-charset)
        (elmo-mime-charset wl-mime-charset))
-    (setq wl-message-buffer-require-all-header (eq display-type
-                                                  'all-header))
+    (setq wl-message-buffer-require-all-header
+         (wl-message-display-all-header-p display-type))
     (prog1
-       (if (eq display-type 'as-is)
-           (let (wl-highlight-x-face-function)
-             (prog1 (elmo-mime-display-as-is folder number
-                                             (current-buffer)
-                                             (wl-message-get-original-buffer)
-                                             'wl-original-message-mode
-                                             force-reload
-                                             unread
-                                             (wl-message-define-keymap))
-               (let (buffer-read-only)
-                 (wl-highlight-message (point-min) (point-max) t))))
-         (elmo-mime-message-display folder number
-                                    (current-buffer)
-                                    (wl-message-get-original-buffer)
-                                    'wl-original-message-mode
-                                    force-reload
-                                    unread
-                                    (wl-message-define-keymap)))
+       (if (wl-message-mime-analysis-p display-type)
+           (elmo-mime-message-display folder number
+                                      (current-buffer)
+                                      (wl-message-get-original-buffer)
+                                      'wl-original-message-mode
+                                      force-reload
+                                      unread
+                                      (wl-message-define-keymap))
+         (let* ((elmo-mime-display-header-analysis
+                 (wl-message-mime-analysis-p display-type 'header))
+                (wl-highlight-x-face-function
+                 (and elmo-mime-display-header-analysis
+                      wl-highlight-x-face-function)))
+           (prog1 (elmo-mime-display-as-is folder number
+                                           (current-buffer)
+                                           (wl-message-get-original-buffer)
+                                           'wl-original-message-mode
+                                           force-reload
+                                           unread
+                                           (wl-message-define-keymap))
+             (let (buffer-read-only)
+               (wl-highlight-message (point-min) (point-max) t)))))
       (run-hooks 'wl-message-display-internal-hook)
       (setq buffer-read-only t))))
 
@@ -681,6 +718,9 @@ Returns non-nil if bottom of message."
                   (key (list (elmo-folder-name-internal folder)
                              number message-id))
                   (hit (wl-message-buffer-cache-hit key))
+                  (display-type (wl-message-make-display-type
+                                 wl-summary-buffer-display-mime-mode
+                                 wl-summary-buffer-display-header-mode))
                   result time1 time2 sec micro)
              (when wl-message-buffer-prefetch-debug
                (message "%d: count %d, hit %s" number count (buffer-name hit)))
@@ -698,7 +738,7 @@ Returns non-nil if bottom of message."
                  (setq time1 (current-time))
                  (message "Prefetching %d..." number))
                (setq result (wl-message-buffer-display
-                             folder number 'mime nil 'unread))
+                             folder number display-type nil 'unread))
                (when wl-message-buffer-prefetch-debug
                  (setq time2 (current-time))
                  (setq sec  (- (nth 1 time2)(nth 1 time1)))