X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-message.el;h=c9dbb637da2315840ad5b019131c570f6ecea8f3;hb=fff721070783297e37f944185f145ce6ff4f581e;hp=cde7f31833723bb3f1d8e370e7c21e513d493e07;hpb=1159ed3f0d564da1dfd08e875f04b51e7c32f7d2;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-message.el b/wl/wl-message.el
index cde7f31..c9dbb63 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -1,4 +1,4 @@
-;;; wl-message.el -- Message displaying modules for Wanderlust.
+;;; wl-message.el --- Message displaying modules for Wanderlust.
 
 ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 
@@ -24,10 +24,10 @@
 ;;
 
 ;;; Commentary:
-;; 
+;;
 
 ;;; Code:
-;; 
+;;
 
 (require 'wl-vars)
 (require 'wl-highlight)
@@ -47,8 +47,6 @@
 (defvar wl-message-buffer-prefetch-get-next-function
   'wl-summary-default-get-next-msg)
 
-(defvar wl-message-buffer-prefetch-folder-type-list t)
-
 (defvar wl-message-buffer-prefetch-debug nil)
 
 (defvar wl-message-buffer nil) ; message buffer.
@@ -205,9 +203,9 @@ Return its cache buffer."
     (if window
 	(select-window window)
       (when wl-fixed-window-configuration
-        (delete-other-windows)
-        (and wl-stay-folder-window
-             (wl-summary-toggle-disp-folder)))
+	(delete-other-windows)
+	(and wl-stay-folder-window
+	     (wl-summary-toggle-disp-folder)))
       ;; There's no buffer window. Search for message window and snatch it.
       (if (setq window (wl-message-buffer-window))
 	  (select-window window)
@@ -230,7 +228,7 @@ If ARG is specified, narrow to ARGth page."
   (setq arg (if arg (prefix-numeric-value arg) 0))
   (save-excursion
     (condition-case ()
-        (forward-page -1)               ; Beginning of current page.
+	(forward-page -1)		; Beginning of current page.
       (beginning-of-buffer
        (goto-char (point-min))))
     (forward-char 1)  ; for compatibility with emacs-19.28 and emacs-19.29
@@ -303,7 +301,7 @@ Returns non-nil if bottom of message."
 	      ;; XEmacs 21.2.20 and later.
 	      (let (window-pixel-scroll-increment)
 		(scroll-up lines))
-	    (scroll-up lines))	      
+	    (scroll-up lines))
 	(end-of-buffer
 	 (goto-char (point-max))))
       (setq bottom nil))
@@ -323,7 +321,7 @@ Returns non-nil if bottom of message."
   (let ((mail-reply-buffer buffer))
     (wl-draft-yank-from-mail-reply-buffer nil)))
 
-;; 
+;;
 
 (defun wl-message-mode ()
   "A major mode for message displaying."
@@ -356,7 +354,7 @@ Returns non-nil if bottom of message."
 	  (wl-message-select-buffer wl-message-buffer))
       (wl-summary-goto-folder-subr wl-message-buffer-cur-folder 'no-sync
 				   nil nil t)
-  					; no summary-buf
+					; no summary-buf
       (let ((sum-buf (current-buffer)))
 	(wl-message-select-buffer wl-message-buffer)
 	(setq wl-message-buffer-cur-summary-buffer sum-buf)))))
@@ -383,7 +381,7 @@ Returns non-nil if bottom of message."
 	       (match-end (nth 1 entry))
 	       (nth 2 entry)
 	       (match-string (nth 3 entry))))))))))
-  
+
 (defun wl-message-add-buttons-to-header (start end)
   (save-excursion
     (save-restriction
@@ -506,10 +504,9 @@ Returns non-nil if bottom of message."
 
 (defun wl-message-display-internal (folder number flag
 					   &optional force-reload unread)
-  (let ((elmo-message-fetch-threshold wl-fetch-confirm-threshold)
-	(default-mime-charset wl-mime-charset))
+  (let ((default-mime-charset wl-mime-charset))
     (setq wl-message-buffer-all-header-flag (eq flag 'all-header))
-    (prog1 
+    (prog1
 	(if (eq flag 'as-is)
 	    (let (wl-highlight-x-face-function)
 	      (prog1 (elmo-mime-display-as-is folder number
@@ -532,24 +529,25 @@ Returns non-nil if bottom of message."
       (setq buffer-read-only t))))
 
 (defsubst wl-message-buffer-prefetch-p (folder &optional number)
-  (cond 
-   ((eq wl-message-buffer-prefetch-folder-type-list t)
-    t)
-   ((and number wl-message-buffer-prefetch-folder-type-list)
-    (memq (elmo-folder-type-internal
-	   (elmo-message-folder folder number))
-	  wl-message-buffer-prefetch-folder-type-list))
-   (wl-message-buffer-prefetch-folder-type-list
-    (let ((list wl-message-buffer-prefetch-folder-type-list)
-	  type)
-      (catch 'done
-	(while (setq type (pop list))
-	  (if (elmo-folder-contains-type folder type)
-	      (throw 'done t))))))
-   ((consp wl-message-buffer-prefetch-folder-type-list)
-    (wl-string-match-member (elmo-folder-name-internal folder)
-			    wl-message-buffer-prefetch-folder-type-list))
-   (t wl-message-buffer-prefetch-folder-type-list)))
+  (or (cond
+       ((eq wl-message-buffer-prefetch-folder-type-list t)
+	t)
+       ((and number wl-message-buffer-prefetch-folder-type-list)
+	(memq (elmo-folder-type-internal
+	       (elmo-message-folder folder number))
+	      wl-message-buffer-prefetch-folder-type-list))
+       (wl-message-buffer-prefetch-folder-type-list
+	(let ((list wl-message-buffer-prefetch-folder-type-list)
+	      type)
+	  (catch 'done
+	    (while (setq type (pop list))
+	      (if (elmo-folder-contains-type folder type)
+		  (throw 'done t)))))))
+      (cond
+       ((consp wl-message-buffer-prefetch-folder-list)
+	(wl-string-match-member (elmo-folder-name-internal folder)
+				wl-message-buffer-prefetch-folder-list))
+       (t wl-message-buffer-prefetch-folder-list))))
 
 (defvar wl-message-buffer-prefetch-timer nil)
 
@@ -585,7 +583,7 @@ Returns non-nil if bottom of message."
 						      number message-id)))
 	      (let* ((size (elmo-message-field folder number 'size)))
 		(when (or (elmo-message-file-p folder number)
-			  (not 
+			  (not
 			   (and (integerp size)
 				elmo-message-fetch-threshold
 				(>= size