* wl-score.el (wl-summary-score-update-all-lines): Use

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

diff --git a/wl/wl-message.el b/wl/wl-message.el
index 1dc1e80..4a243eb 100644 (file)
--- 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
@@ -146,9 +147,12 @@ Return its cache buffer."
        (buf nil))
     (if (< len wl-message-buffer-cache-size)
        (setq buf (wl-message-buffer-create))
-      (setq buf (wl-message-buffer-cache-buffer-get
-                (nth (1- len) wl-message-buffer-cache)))
-      (setcdr (nthcdr (- len 2) wl-message-buffer-cache) nil))
+      (let ((entry (nth (1- len) wl-message-buffer-cache)))
+       (if (buffer-live-p
+            (setq buf (wl-message-buffer-cache-buffer-get entry)))
+           (setcdr (nthcdr (- len 2) wl-message-buffer-cache) nil)
+         (setq wl-message-buffer-cache (delq entry wl-message-buffer-cache))
+         (setq buf (wl-message-buffer-create)))))
     (setq wl-message-buffer-cache
          (cons (wl-message-buffer-cache-entry-make key buf)
                wl-message-buffer-cache))
@@ -173,7 +177,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 +272,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 +308,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 +369,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
@@ -417,7 +423,7 @@ Returns non-nil if bottom of message."
         message-buf
         strategy entity
         cache-used
-        header-end real-fld-num summary-win delim)
+        summary-win delim)
     (setq buffer-read-only nil)
     (setq cache-used (wl-message-buffer-display
                      folder number flag force-reload))
@@ -433,12 +439,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 +484,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.
@@ -585,18 +595,14 @@ Returns non-nil if bottom of message."
      'wl-message-buffer-prefetch-subr
      folder number count summary charset)))
 
-(defvar wl-message-buffer-prefetch-move-spec-plugged-alist nil)
-(defvar wl-message-buffer-prefetch-move-spec-unplugged-alist nil)
+(defvar wl-message-buffer-prefetch-move-spec-alist nil)
 
 (defun wl-message-buffer-prefetch-get-next (folder number summary)
   (if (buffer-live-p summary)
       (with-current-buffer summary
-       (let ((wl-summary-move-spec-plugged-alist
-              (or wl-message-buffer-prefetch-move-spec-plugged-alist
-                  wl-summary-move-spec-plugged-alist))
-             (wl-summary-move-spec-unplugged-alist
-              (or wl-message-buffer-prefetch-move-spec-unplugged-alist
-                  wl-summary-move-spec-unplugged-alist))
+       (let ((wl-summary-move-spec-alist
+              (or wl-message-buffer-prefetch-move-spec-alist
+                  wl-summary-move-spec-alist))
              (next number))
          (while (and (setq next (funcall
                                  wl-message-buffer-prefetch-get-next-function