From: okazaki <okazaki>
Date: Thu, 25 May 2000 19:03:07 +0000 (+0000)
Subject: * elmo-localdir.el (elmo-localdir-pack-number): Renamed
X-Git-Tag: wl-2_4-root~166
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=eb2f23dcf27461f2d4d4bdf8694a2d3dedfe43d2;p=elisp%2Fwanderlust.git

* elmo-localdir.el (elmo-localdir-pack-number): Renamed
the local variable for a packed number self descriptively.
Initialized it correctly with 1.
---

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 58f3218..2364ece 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -396,35 +396,36 @@
 	(onum-alist (elmo-msgdb-get-number-alist msgdb))
 	(omark-alist (elmo-msgdb-get-mark-alist msgdb))
 	(oov (elmo-msgdb-get-overview msgdb))
-	i flist onum mark new-mark-alist total)
+	(new-number 1)			; first ordinal position in localdir
+	flist onum mark new-mark-alist total)
     (setq flist
 	  (if elmo-pack-number-check-strict
-	      (elmo-call-func spec "list-folder") ;; allow localnews
+	      (elmo-call-func spec "list-folder") ; allow localnews
 	    (mapcar 'car onum-alist)))
     (setq total (length flist))
     (while flist
       (elmo-display-progress
        'elmo-localdir-pack-number "Packing..."
-       (/ (* i 100) total))
+       (/ (* new-number 100) total))
       (setq onum (car flist))
-      (when (not (eq onum i)) ;; why \=() is wrong..
+      (when (not (eq onum new-number))		; why \=() is wrong..
         (elmo-bind-directory
 	 dir
 	 ;; xxx  nfs,hardlink
-	 (rename-file (int-to-string onum) (int-to-string i) t))
+	 (rename-file (int-to-string onum) (int-to-string new-number) t))
         ;; update overview
         (elmo-msgdb-overview-entity-set-number
 	 (elmo-msgdb-overview-get-entity-by-number
-	  oov onum) i)
+	  oov onum) new-number)
 	;; update number-alist
-	(setcar (assq onum onum-alist) i))
+	(setcar (assq onum onum-alist) new-number))
       ;; update mark-alist
       (when (setq mark (cadr (assq onum omark-alist)))
 	(setq new-mark-alist
 	      (elmo-msgdb-mark-append
 	       new-mark-alist
-	       i mark)))
-      (setq i (1+ i))
+	       new-number mark)))
+      (setq new-number (1+ new-number))
       (setq flist (cdr flist)))
     (message "Packing...done.")
     (list (elmo-msgdb-get-overview msgdb)