From 620db3ac62baace8ccea7b7717431402f213a8e9 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Fri, 1 Apr 2005 12:42:40 +0000
Subject: [PATCH] * elmo.el (elmo-folder-synchronize): Ignore errors while
 updating flag table.

* elmo-maildir.el (elmo-maildir-list-location): Sort by last
modification time of the file.

* elmo-version.el (elmo-version): Up to 2.14.1.

* elmo.el (elmo-folder-synchronize): Clear msgdb even when an
error occured while updating flag table.
---
 doc/version.tex      |    2 +-
 doc/version.texi     |    2 +-
 elmo/ChangeLog       |    8 ++++++++
 elmo/elmo-maildir.el |    6 ++++++
 elmo/elmo-version.el |    2 +-
 elmo/elmo.el         |    6 +++---
 etc/VERSION          |    1 +
 wl/ChangeLog         |    4 ++++
 wl/wl-version.el     |    2 +-
 9 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/doc/version.tex b/doc/version.tex
index 7d5024e..ab160c5 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1 +1 @@
-\def\versionnumber{2.14.0}
+\def\versionnumber{2.14.1}
diff --git a/doc/version.texi b/doc/version.texi
index 3059a56..d40fe16 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1 +1 @@
-@set VERSION 2.14.0
+@set VERSION 2.14.1
diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ac81799..dece70d 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,13 @@
 2005-04-01  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* elmo.el (elmo-folder-synchronize): Ignore errors while updating
+	flag table.
+
+	* elmo-maildir.el (elmo-maildir-list-location): Sort by last
+	modification time of the file.
+
+	* elmo-version.el (elmo-version): Up to 2.14.1.
+
 	* elmo.el (elmo-folder-synchronize): Clear msgdb even when an
 	error occured while updating flag table.
 
diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 6710212..cbbdb12 100644
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -114,6 +114,12 @@ LOCATION."
 			       nil "^[^.].*$" t))
 	 unread-locations flagged-locations answered-locations
 	 sym locations flag-list)
+    (setq cur (sort cur
+		    (lambda (x y)
+		      (< (elmo-get-last-modification-time
+			  (expand-file-name x cur-dir))
+			 (elmo-get-last-modification-time
+			  (expand-file-name y cur-dir))))))
     (setq locations
 	  (mapcar
 	   (lambda (x)
diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index 9ab83f2..650c002 100644
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -40,7 +40,7 @@
 ;; product-define in the first place
 (product-provide 'elmo-version
   ;; Don't forget to check `wl-version.el' and Info.
-  (product-define "ELMO" nil '(2 14 0)))
+  (product-define "ELMO" nil '(2 14 1)))
 
 ;; set version-string
 (product-version-as-string 'elmo-version)
diff --git a/elmo/elmo.el b/elmo/elmo.el
index d414845..97349d4 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1533,9 +1533,9 @@ If update process is interrupted, return nil.")
 	(flag-table (elmo-flag-table-load (elmo-folder-msgdb-path folder)))
 	(before-append t))
     (when ignore-msgdb
-      (unwind-protect
-	  (elmo-msgdb-flag-table (elmo-folder-msgdb folder) flag-table)
-	(elmo-folder-clear folder (not disable-killed))))
+      (ignore-errors
+	(elmo-msgdb-flag-table (elmo-folder-msgdb folder) flag-table))
+      (elmo-folder-clear folder (not disable-killed)))
     (unless no-check (elmo-folder-check folder))
     (condition-case nil
 	(let ((killed-list (elmo-folder-killed-list-internal folder))
diff --git a/etc/VERSION b/etc/VERSION
index 4e35590..1bb72fe 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -135,5 +135,6 @@
 2.13.x  You Oughta Know
 
 2.14.0  Africa
+2.14.1  Bad Medicine
 
 2.15.x  Almost Unreal
\ No newline at end of file
diff --git a/wl/ChangeLog b/wl/ChangeLog
index fdacef7..8741f07 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-01  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* Version number is increased to 2.14.1.
+
 2005-03-25  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* 2.14.0 is released.
diff --git a/wl/wl-version.el b/wl/wl-version.el
index fd9cc94..1cc29e0 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -46,7 +46,7 @@
    "Wanderlust" nil
    (eval-when-compile
      (product-version (product-find 'elmo-version))) ; equals to ELMO version.
-   "Africa"))
+   "Bad Medicine-pre"))
 
 (defconst wl-version-status nil
   "Wanderlust verstion status.  For override default rule.
-- 
1.7.10.4