From 9c79e37f8377b35f35f5830a1186443486e506ff Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 5 Apr 2005 13:54:24 +0000
Subject: [PATCH] (elmo-maildir-sequence-number): New function.
 (elmo-maildir-make-unique-string): Throw Emacs 18 away.
 (elmo-maildir-list-location): Use
 `elmo-maildir-sequence-number' to compare sequence number
 when last modified time is nil.

---
 elmo/ChangeLog       |    7 ++++++
 elmo/elmo-maildir.el |   62 +++++++++++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6d494f7..2624c8b 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-maildir.el (elmo-maildir-sequence-number): New function.
+	(elmo-maildir-make-unique-string): Throw Emacs 18 away.
+	(elmo-maildir-list-location): Use `elmo-maildir-sequence-number' to
+	compare sequence number when last modified time is nil.
+
 2005-04-03  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-maildir.el (elmo-folder-msgdb-create): Don't sort by date.
diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 5031d61..9632959 100644
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -113,13 +113,19 @@ LOCATION."
 	 (cur (directory-files cur-dir
 			       nil "^[^.].*$" t))
 	 unread-locations flagged-locations answered-locations
-	 sym locations flag-list)
+	 sym locations flag-list x-time y-time)
     (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 x-time (elmo-get-last-modification-time
+				    (expand-file-name x cur-dir))
+			    y-time (elmo-get-last-modification-time
+				    (expand-file-name y cur-dir)))
+		      (cond
+		       ((< x-time y-time)
+			t)
+		       ((eq x-time y-time)
+			(< (elmo-maildir-sequence-number x)
+			   (elmo-maildir-sequence-number y)))))))
     (setq locations
 	  (mapcar
 	   (lambda (x)
@@ -377,36 +383,24 @@ LOCATION."
 
 (defvar elmo-maildir-sequence-number-internal 0)
 
-(static-cond
- ((>= emacs-major-version 19)
-  (defun elmo-maildir-make-unique-string ()
-    "This function generates a string that can be used as a unique
-file name for maildir directories."
-     (let ((cur-time (current-time)))
-       (format "%.0f.%d_%d.%s"
- 	      (+ (* (car cur-time)
-                    (float 65536)) (cadr cur-time))
-	      (emacs-pid)
-	      (incf elmo-maildir-sequence-number-internal)
-	      (system-name)))))
- ((eq emacs-major-version 18)
-  ;; A fake function for v18
-  (defun elmo-maildir-make-unique-string ()
-    "This function generates a string that can be used as a unique
+(defun elmo-maildir-sequence-number (file)
+  "Get `elmo-maildir' specific sequence number from FILE.
+Not that FILE is the name without directory."
+  ;; elmo-maildir specific.
+  (if (string-match "^.*_\\([0-9]+\\)\\..*" file)
+      (string-to-number (match-string 1 file))
+    -1))
+
+(defun elmo-maildir-make-unique-string ()
+  "This function generates a string that can be used as a unique
 file name for maildir directories."
-    (unless (fboundp 'float-to-string)
-      (load-library "float"))
-    (let ((time (current-time)))
-      (format "%s%d.%d.%s"
-	      (substring
-	       (float-to-string
-		(f+ (f* (f (car time))
-			(f 65536))
-		    (f (cadr time))))
-	       0 5)
-	      (cadr time)
-	      (% (abs (random t)) 10000); dummy pid
-	      (system-name))))))
+  (let ((cur-time (current-time)))
+    (format "%.0f.%d_%d.%s"
+	    (+ (* (car cur-time)
+		  (float 65536)) (cadr cur-time))
+	    (emacs-pid)
+	    (incf elmo-maildir-sequence-number-internal)
+	    (system-name))))
 
 (defun elmo-maildir-temporal-filename (basedir)
   (let ((filename (expand-file-name
-- 
1.7.10.4