From: teranisi <teranisi>
Date: Thu, 27 Dec 2001 00:41:59 +0000 (+0000)
Subject: Synch up with main trunk.
X-Git-Tag: wl-2_8_0~11
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288a5353646f5d2db2a37efa3a219a8e3da563c4;p=elisp%2Fwanderlust.git

Synch up with main trunk.
---

diff --git a/ChangeLog b/ChangeLog
index 488dbf3..e5bc9c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2001-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* NEWS, NEWS.ja: Added description about
-	`elmo-enable-disconnected-operation'.
+	`elmo-enable-disconnected-operation';
+	Added description about "$" mark.
 
 	* WL-MK (update-version): New function.
 
diff --git a/NEWS b/NEWS
index d5328ec..75ce68d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,11 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 ** Now available `make check' environment test for user.
 
-** If you set obsolete variables (e.g. renamed ones), Wanderlust shows warning
-   messages and urge you to change settings.
-   Please change your settings according to the messages.
-   To suppress warning messages, set elmo-obsolete-variable-show-warnings to
-   nil.
+** If you set obsolete variables (e.g. renamed ones) in .wl etc, Wanderlust
+   shows warning messages and urge you to change settings.
+   Change your settings according to the messages, please.
+   If you want to suppress warnings, set elmo-obsolete-variable-show-warnings
+   to nil.
 
 ** Added new internal folders: 'sendlog folder
 
@@ -74,13 +74,16 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 ** elmo-cache-dirname is abolished and elmo-cache-directory is newly created.
    You can put cache directory to another place by setting
-   elmo-cache-directory (e.g. for whom put symbolic link for ~/.elmo/cache
-   on NFS environment).
+   elmo-cache-directory.
 
 ** Default value of elmo-enable-disconnected-operation is now `t'.
    When the relevant messages are cached, you can do some operations
    even in the off-line state.
 
+** Now messages with "$" mark is not remained in the summary buffer when
+   the actual message itself is deleted.
+   Please visit the 'mark folder to review the messages with the "$" mark.
+
 * Version 2.6.1 is basically a bug fix version of 2.6.0.
 
 ** Fixed a problem that Emacs 21 causes `Recursive load...' error.
diff --git a/NEWS.ja b/NEWS.ja
index a1e8493..73b8723 100644
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -9,11 +9,10 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust.
 
 ** make check で簡単な環境テストができるようになりました。
 
-** 名前変更等で既に使われなくなった変数が設定されていると warning
-   が表示されるようになりました。
-   メッセージを参考にして、新しい設定に変更してください。
-   warning の表示を抑制するには、変数 elmo-obsolete-variable-show-warnings を
-   nil にしてください。
+** 名前変更等で使われなくなった変数を .wl 等で設定していると、警告が表示され
+   ます。メッセージを参考にして、設定を変更してください。
+   もし何らかの理由で警告の表示を抑制したい場合には、変数
+   elmo-obsolete-variable-show-warnings を nil にしてください。
 
 ** 新規内部フォルダ 'sendlog が追加されました。
 
@@ -71,17 +70,21 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust.
 
 ** xxx-dir という名前の変数は xxx-directory という名前に変更されました。
    例えば、wl-icon-dir は wl-icon-directory に変更されています。
-   Emacs21 で logo 表示などの設定している方は特に注意してください。
+   Emacs21 で logo 表示などの設定をしている方は特に注意してください。
 
 ** elmo-cache-dirname を廃止して elmo-cache-directory を新設しました。
-   NFS 環境などで ~/.elmo/cache をシンボリックリンクで飛ばしていた
-   方は、elmo-cache-directory を設定することによってキャッシュだけ
-   を全く別のディレクトリにできます。
+   elmo-cache-directory を設定することによってキャッシュだけを全く別の
+   ディレクトリに置くことができます。
 
 ** elmo-enable-disconnected-operation のデフォルト値が t になりました。
    オフライン状態でもメッセージがキャッシュされていれば、ある程度の
    メッセージ操作が可能です。
 
+** "$" マークの付いたメッセージは、メッセージの実体が消えた場合にはサマリから
+   も消えるようになりました。
+   "$" マークの付いたメッセージを見直したい場合は 'mark フォルダを参照して
+   ください。
+
 * 2.6.1 は 2.6.0 の修正版です。
 
 ** Emacs 21 で Recursive load... と出る不具合が修正されました。
diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index f4b32e8..957658d 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,25 @@
 2001-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* elmo-imap4.el (elmo-imap4-message-fetch): Fixed '100%' message.
+
+	* elmo-pop3.el (elmo-message-fetch-plugged): Ditto.
+
+	* elmo-util.el (elmo-progress-clear): Ditto.
+
+	* elmo-date.el (elmo-date-get-datevec): Fix timezone of
+	`DD-Mon-YYYY' type date.
+
+2001-12-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-util.el (elmo-buffer-field-primitive-condition-match): Use
+	`elmo-date-make-sortable-string' instead of
+	`timezone-make-date-sortable'.
+
+	* elmo-date.el (elmo-date-make-sortable-string): Use
+	`timezone-make-time-string'.
+
+2001-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
 	* elmo.el (elmo-folder-synchronize): Delete important messages too.
 
 	* elmo-util.el (elmo-buffer-field-primitive-condition-match): Fixed
diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index 47d10c9..8bd1b3b 100644
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -128,8 +128,8 @@ Otherwise treat \\ in NEWTEXT string as special:
 	  (error "%s is not supported yet" suffix)))))
    ((string-match "[0-9]+-[A-Za-z]+-[0-9]+" description)
     (timezone-fix-time
-     (concat (elmo-replace-in-string description "-" " ") " 0:00")
-     nil nil))))
+     (concat (elmo-replace-in-string description "-" " ") " 0:0")
+     (current-time-zone) nil))))
 
 (defun elmo-datevec-substitute (datevec1 datevec2)
   (if (/= (aref datevec2 2) 0)
@@ -157,8 +157,7 @@ Otherwise treat \\ in NEWTEXT string as special:
     (setq p 1)
     (while (< p month)
       (setq days (+ days (timezone-last-day-of-month p year)))
-      (setq p (+ p 1))
-      )
+      (setq p (+ p 1)))
     (setq days (+ days mday))
     (aref wday (% days 7))))
 
@@ -201,7 +200,10 @@ Otherwise treat \\ in NEWTEXT string as special:
       (aref (, datevec) 0)
       (aref (, datevec) 1)
       (aref (, datevec) 2)
-      (aref (, datevec) 3))))
+      (timezone-make-time-string
+       (aref (, datevec) 3)
+       (aref (, datevec) 4)
+       (aref (, datevec) 5)))))
 
 (require 'product)
 (product-provide (provide 'elmo-date) (require 'elmo-version))
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 2e7e1bd..c9ae6e2 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2523,7 +2523,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
       (setq elmo-imap4-display-literal-progress nil))
     (unless elmo-inhibit-display-retrieval-progress
       (elmo-display-progress 'elmo-imap4-display-literal-progress
-			     "" 100)  ; remove progress bar.
+			     "Retrieving..." 100)  ; remove progress bar.
       (message "Retrieving...done."))
     (if (setq response (elmo-imap4-response-bodydetail-text
 			(elmo-imap4-response-value-all
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index c1e63bd..9c7dc63 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -877,7 +877,8 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
 	  (setq elmo-pop3-total-size nil))
 	(unless elmo-inhibit-display-retrieval-progress
 	  (elmo-display-progress
-	   'elmo-display-retrieval-progress "" 100)  ; remove progress bar.
+	   'elmo-display-retrieval-progress
+	   "Retrieving..." 100)  ; remove progress bar.
 	  (message "Retrieving...done."))
 	(set-buffer outbuf)
 	(goto-char (point-min))
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index d84d544..fe62464 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -816,37 +816,26 @@ Return value is a cons cell of (STRUCTURE . REST)"
 			 (length (memq number number-list)))
 		      (string-to-int (elmo-filter-value condition)))))
      ((string= (elmo-filter-key condition) "since")
-      (let* ((date (elmo-date-get-datevec (elmo-filter-value condition)))
-	     (field-date (elmo-date-make-sortable-string
-			  (timezone-fix-time
-			   (std11-field-body "date")
-			   (current-time-zone) nil)))
-	     (specified-date (timezone-make-sortable-date
-			      (aref date 0)
-			      (aref date 1)
-			      (aref date 2)
-			      (timezone-make-time-string
-			       (aref date 3)
-			       (aref date 4)
-			       (aref date 5)))))
+      (let ((field-date (elmo-date-make-sortable-string
+			 (timezone-fix-time
+			  (std11-field-body "date")
+			  (current-time-zone) nil)))
+	    (specified-date (elmo-date-make-sortable-string
+			     (elmo-date-get-datevec
+			      (elmo-filter-value condition)))))
 	(setq result
 	      (or (string= field-date specified-date)
 		  (string< specified-date field-date)))))
      ((string= (elmo-filter-key condition) "before")
-      (let ((date (elmo-date-get-datevec (elmo-filter-value condition))))
-	(setq result
-	      (string<
-	       (timezone-make-date-sortable
-		(timezone-fix-time
-		 (std11-field-body "date")
-		 (current-time-zone) nil))
-	       (timezone-make-sortable-date (aref date 0)
-					    (aref date 1)
-					    (aref date 2)
-					    (timezone-make-time-string
-					     (aref date 3)
-					     (aref date 4)
-					     (aref date 5)))))))
+      (setq result
+	    (string<
+	     (elmo-date-make-sortable-string
+	      (timezone-fix-time
+	       (std11-field-body "date")
+	       (current-time-zone) nil))
+	     (elmo-date-make-sortable-string
+	      (elmo-date-get-datevec
+	       (elmo-filter-value condition))))))
      ((string= (elmo-filter-key condition) "body")
       (and (re-search-forward "^$" nil t)	   ; goto body
 	   (setq result (search-forward (elmo-filter-value condition)
@@ -1184,7 +1173,9 @@ the value of `foo'."
 (defun elmo-progress-clear (label)
   (let ((counter (assq label elmo-progress-counter-alist)))
     (when counter
-      (elmo-display-progress label "" 100)
+      (elmo-display-progress label
+			     (elmo-progress-counter-format counter)
+			     100)
       (setq elmo-progress-counter-alist
 	    (delq counter elmo-progress-counter-alist)))))