From 405cc469ae66e75052efef2af862d93b29f68c50 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Wed, 21 Feb 2001 08:48:14 +0000
Subject: [PATCH] Fixed last change.

---
 elmo/elmo-nntp.el |    8 ++++----
 elmo/elmo-pop3.el |   16 ++++++++--------
 wl/wl-summary.el  |    3 ---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 70da479..f481f98 100644
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -976,7 +976,7 @@ Don't cache if nil.")
 					number strategy
 					&optional section
 					outbuf
-					unseen)
+					unread)
   (if (elmo-folder-plugged-p folder)
       (let ((cache-file (elmo-file-cache-expand-path
 			 (elmo-fetch-strategy-cache-path strategy)
@@ -1002,7 +1002,7 @@ Don't cache if nil.")
 	      (with-current-buffer outbuf
 		(elmo-folder-send folder 'elmo-message-fetch-plugged
 				  number strategy section
-				  (current-buffer) unseen)
+				  (current-buffer) unread)
 		(elmo-delete-cr-buffer)
 		(when (and (> (buffer-size) 0)
 			   (elmo-fetch-strategy-save-cache strategy))
@@ -1013,7 +1013,7 @@ Don't cache if nil.")
 	    (with-temp-buffer
 	      (elmo-folder-send folder 'elmo-message-fetch-plugged
 				number strategy section
-				(current-buffer) unseen)
+				(current-buffer) unread)
 	      (elmo-delete-cr-buffer)
 	      (when (and (> (buffer-size) 0)
 			 (elmo-fetch-strategy-save-cache strategy))
@@ -1022,7 +1022,7 @@ Don't cache if nil.")
 		 section))
 	      (buffer-string)))))
     (elmo-folder-send folder 'elmo-message-fetch-unplugged
-		      number strategy section outbuf unseen)))
+		      number strategy section outbuf unread)))
 
 (luna-define-method elmo-message-fetch-plugged ((folder elmo-nntp-folder)
 						number strategy
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index f69e0af..9233f4e 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -75,14 +75,14 @@ Any symbol value of `elmo-network-stream-type-alist' or
   :type 'boolean
   :group 'elmo)
 
-(elmo-put-obsolete-variable 'elmo-default-pop3-server
-			    'elmo-pop3-default-server)
-(elmo-put-obsolete-variable 'elmo-default-pop3-user
-			    'elmo-pop3-default-user)
-(elmo-put-obsolete-variable 'elmo-default-pop3-authenticate-type
-			    'elmo-pop3-default-authenticate-type)
-(elmo-put-obsolete-variable 'elmo-default-pop3-port
-			    'elmo-pop3-default-port)
+(elmo-define-obsolete-variable 'elmo-default-pop3-server
+			       'elmo-pop3-default-server)
+(elmo-define-obsolete-variable 'elmo-default-pop3-user
+			       'elmo-pop3-default-user)
+(elmo-define-obsolete-variable 'elmo-default-pop3-authenticate-type
+			       'elmo-pop3-default-authenticate-type)
+(elmo-define-obsolete-variable 'elmo-default-pop3-port
+			       'elmo-pop3-default-port)
 
 (defvar elmo-pop3-stream-type-alist nil
   "*Stream bindings for POP3.
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index c1b1c87..86a322b 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2629,9 +2629,6 @@ If ARG, without confirm."
 				    wl-summary-highlight-partial-threshold)))
 		    (wl-highlight-summary (point) (point-max)))
 		(wl-highlight-summary (point-min) (point-max))))
-	  (if (null wl-summary-buffer-msgdb) ;; one more try.
-	      (setq wl-summary-buffer-msgdb
-		    (elmo-msgdb-load (elmo-string fld))))
 	  (if (eq retval 'disp-msg)
 	      (wl-summary-redisplay))
 	  (if mes (message "%s" mes))
-- 
1.7.10.4