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 8d654c3..1592ddc 100644 (file)
--- 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
@@ -441,6 +441,11 @@ Returns non-nil if bottom of message."
 (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)
@@ -576,7 +581,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 +590,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)))