X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-message.el;h=c094061ffbfe19fa32255155b2989464ca95d9e8;hb=c20fb61cd99f50dd4eb03aa29a40b44c802efe17;hp=1dc1e80399eab7f3b036ab9b8b2e77e695ecba6b;hpb=08fe50f15e7aed9643f87a7cbb552690c6908318;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-message.el b/wl/wl-message.el
index 1dc1e80..c094061 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -61,6 +61,7 @@
 (defvar wl-message-buffer-cur-summary-buffer nil)
 (defvar wl-message-buffer-original-buffer nil) ; original buffer.
 (defvar wl-message-buffer-all-header-flag nil)
+(defvar wl-message-buffer-mode-line-formatter nil)
 
 (make-variable-buffer-local 'wl-message-buffer-cur-folder)
 (make-variable-buffer-local 'wl-message-buffer-cur-number)
@@ -68,6 +69,7 @@
 (make-variable-buffer-local 'wl-message-buffer-cur-summary-buffer)
 (make-variable-buffer-local 'wl-message-buffer-original-buffer)
 (make-variable-buffer-local 'wl-message-buffer-all-header-flag)
+(make-variable-buffer-local 'wl-message-buffer-mode-line-formatter)
 
 (defvar wl-fixed-window-configuration nil)
 
@@ -109,7 +111,6 @@ With association ((\"folder\" message \"message-id\") . cache-buffer).")
 ;    (setcdr pointer (list entry))
 ;    (setq wl-message-buffer-cache (cdr top))))
 
-(defconst wl-message-buffer-cache-name    " *WL:Message*")
 (defconst wl-original-message-buffer-name " *Original*")
 
 (defun wl-original-message-mode ()
@@ -131,7 +132,7 @@ If original message buffer already exists, it is re-used."
 
 (defun wl-message-buffer-create ()
   "Create a new message buffer."
-  (let* ((buffer (generate-new-buffer wl-message-buffer-cache-name))
+  (let* ((buffer (generate-new-buffer wl-message-buffer-name))
 	 (name (buffer-name buffer)))
     (with-current-buffer buffer
       (setq wl-message-buffer-original-buffer
@@ -173,7 +174,7 @@ Return its cache buffer."
 	   wl-message-buffer
 	   (get-buffer-window wl-message-buffer))
       (delete-window (get-buffer-window wl-message-buffer)))
-  (wl-kill-buffers (regexp-quote wl-message-buffer-cache-name))
+  (wl-kill-buffers (regexp-quote wl-message-buffer-name))
   (setq wl-message-buffer-cache nil))
 
 ;;; Message buffer handling from summary buffer.
@@ -268,7 +269,7 @@ Returns non-nil if top of message."
 	  (recenter))
       (if (not (bobp))
 	  (condition-case nil
-	      (scroll-down lines)
+	      (scroll-down (or lines wl-message-scroll-amount))
 	    (error))
 	(setq top t)))
     (if real-top
@@ -304,8 +305,8 @@ Returns non-nil if bottom of message."
 	  (static-if (boundp 'window-pixel-scroll-increment)
 	      ;; XEmacs 21.2.20 and later.
 	      (let (window-pixel-scroll-increment)
-		(scroll-up lines))
-	    (scroll-up lines))
+		(scroll-up (or lines wl-message-scroll-amount)))
+	    (scroll-up (or lines wl-message-scroll-amount)))
 	(end-of-buffer
 	 (goto-char (point-max))))
       (setq bottom nil))
@@ -365,7 +366,9 @@ Returns non-nil if bottom of message."
 
 (defun wl-message-get-original-buffer ()
   "Get original buffer for current message buffer."
-  wl-message-buffer-original-buffer)
+  (if (buffer-live-p wl-message-buffer-original-buffer)
+      wl-message-buffer-original-buffer
+    (wl-original-message-buffer-get (buffer-name (current-buffer)))))
 
 (defun wl-message-add-buttons-to-body (start end)
   (save-excursion
@@ -433,12 +436,12 @@ Returns non-nil if bottom of message."
     (setq wl-message-buffer-cur-summary-buffer summary-buf)
     (setq wl-message-buffer-cur-folder (elmo-folder-name-internal folder))
     (setq wl-message-buffer-cur-number number)
+    (wl-line-formatter-setup
+     wl-message-buffer-mode-line-formatter
+     wl-message-mode-line-format
+     wl-message-mode-line-format-spec-alist)
     (setq mode-line-buffer-identification
-	  (format "Wanderlust: << %s / %s >>"
-		  (if (memq 'modeline wl-use-folder-petname)
-		      (wl-folder-get-petname (elmo-folder-name-internal
-					      folder))
-		    (elmo-folder-name-internal folder)) number))
+	  (funcall wl-message-buffer-mode-line-formatter))
     ;; highlight body
 ;    (when wl-highlight-body-too
 ;      (wl-highlight-body))
@@ -478,6 +481,10 @@ Returns non-nil if bottom of message."
 	  ;; buffer cache is used.
 	  (setq cache-used t)
 	  (with-current-buffer hit
+	    ;; Rewind to the top page
+	    (widen)
+	    (goto-char (point-min))
+	    (ignore-errors (wl-message-narrow-to-page))
 	    (unless (eq wl-message-buffer-cur-flag flag)
 	      (setq read t))))
       ;; delete tail and add new to the top.