From: murata <murata>
Date: Thu, 24 May 2001 13:47:27 +0000 (+0000)
Subject: * wl-expire.el (wl-expire-archive-get-folder): Fixed problem that name
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9434e713960177edfdac1b986f36c95f955573fe;p=elisp%2Fwanderlust.git

* wl-expire.el (wl-expire-archive-get-folder): Fixed problem that name
of folder exclude localdir is wrong.
* wl-folder.el (wl-folder-sync-entity): Set
`wl-summary-always-sticky-folder-list' as nil.
(wl-folder-mark-as-read-all-entity): Ditto.
(wl-folder-prefetch-entity): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5c13e84..2dfc552 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-24  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
+
+	* wl-expire.el (wl-expire-archive-get-folder): Fixed problem that
+	name of folder exclude localdir is wrong.
+	* wl-folder.el (wl-folder-sync-entity):
+	Set `wl-summary-always-sticky-folder-list' as nil.
+	(wl-folder-mark-as-read-all-entity): Ditto.
+	(wl-folder-prefetch-entity): Ditto.
+
 2001-05-23  Kenichi OKADA  <okada@opaopa.org>
 
 	* wl-draft.el (wl-draft): use `wl-summary-write-current-folder'
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index f81203a..755221f 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -241,6 +241,9 @@ If REFILE-LIST includes reserve mark message, so copy."
 (defun wl-expire-archive-get-folder (src-folder &optional fmt dst-folder-arg)
   "Get archive folder name from SRC-FOLDER."
   (let* ((fmt (or fmt wl-expire-archive-folder-name-fmt))
+	 (src-folde-name (substring
+			  (elmo-folder-name-internal src-folder)
+			  (length (elmo-folder-prefix-internal src-folder))))
 	 (archive-spec (char-to-string
 			(car (rassq 'archive elmo-folder-type-alist))))
 	 dst-folder-base dst-folder-fmt prefix)
@@ -248,16 +251,13 @@ If REFILE-LIST includes reserve mark message, so copy."
 	   (setq dst-folder-base (concat archive-spec dst-folder-arg)))
 	  ((eq (elmo-folder-type-internal src-folder) 'localdir)
 	   (setq dst-folder-base
-		 (concat archive-spec
-			 (substring
-			  (elmo-folder-name-internal src-folder) 1))))
+		 (concat archive-spec src-folde-name)))
 	  (t
 	   (setq dst-folder-base
 		 (elmo-concat-path
 		  (format "%s%s" archive-spec (elmo-folder-type-internal
 					       src-folder))
-		  (substring (substring (elmo-folder-name-internal src-folder) 1)
-			     (length (elmo-folder-prefix-internal src-folder)))))))
+		  src-folde-name))))
     (setq dst-folder-fmt (format fmt
 				 dst-folder-base
 				 wl-expire-archive-folder-type))
@@ -267,11 +267,9 @@ If REFILE-LIST includes reserve mark message, so copy."
     (when wl-expire-archive-folder-prefix
       (cond ((eq wl-expire-archive-folder-prefix 'short)
 	     (setq prefix (file-name-nondirectory
-			   (substring
-			    (elmo-folder-name-internal src-folder) 1))))
+			   src-folde-name)))
 	    (t
-	     (setq prefix (substring
-			   (elmo-folder-name-internal src-folder) 1))))
+	     (setq prefix src-folde-name)))
       (setq dst-folder-fmt (concat dst-folder-fmt ";" prefix))
       (setq dst-folder-base (concat dst-folder-base ";" prefix)))
     (cons dst-folder-base dst-folder-fmt)))
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index c384614..25a8bac 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -997,7 +997,8 @@ If current line is group folder, check all sub entries."
 	      (or (< 0 new) (< 0 unread)))
 	  (let ((wl-summary-buffer-name (concat
 					 wl-summary-buffer-name
-					 (symbol-name this-command))))
+					 (symbol-name this-command)))
+		(wl-summary-always-sticky-folder-list nil))
 	    (save-window-excursion
 	      (save-excursion
 		(wl-summary-goto-folder-subr entity
@@ -1046,7 +1047,8 @@ If current line is group folder, check all subfolders."
 	    (save-excursion
 	      (let ((wl-summary-buffer-name (concat
 					     wl-summary-buffer-name
-					     (symbol-name this-command))))
+					     (symbol-name this-command)))
+		    (wl-summary-always-sticky-folder-list nil))
 		(wl-summary-goto-folder-subr entity
 					     (wl-summary-get-sync-range folder)
 					     nil)
@@ -2648,7 +2650,8 @@ Use `wl-subscribed-mailing-list'."
 	    (save-excursion
 	      (let ((wl-summary-buffer-name (concat
 					     wl-summary-buffer-name
-					     (symbol-name this-command))))
+					     (symbol-name this-command)))
+		    (wl-summary-always-sticky-folder-list nil))
 		(wl-summary-goto-folder-subr entity
 					     (wl-summary-get-sync-range
 					      folder)