* wl-addrmgr.el (wl-addrmgr-replace-field): Use `point-at-bol'.

[elisp/wanderlust.git] / elmo / elmo-localdir.el

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 3006dec..9651f8a 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -109,7 +109,7 @@
 (luna-define-method elmo-message-file-name ((folder
                                             elmo-localdir-folder)
                                            number)
-  (expand-file-name (int-to-string number)
+  (expand-file-name (number-to-string number)
                    (elmo-localdir-folder-directory-internal folder)))
 
 (luna-define-method elmo-folder-message-file-number-p ((folder
@@ -134,10 +134,10 @@
     (dolist (number numbers)
       (elmo-copy-file
        (expand-file-name
-       (int-to-string number)
+       (number-to-string number)
        (elmo-localdir-folder-directory-internal folder))
        (expand-file-name
-       (int-to-string (if start-number cur-number number))
+       (number-to-string (if start-number cur-number number))
        temp-dir))
       (incf cur-number))
     temp-dir))
@@ -145,7 +145,7 @@
 (defun elmo-localdir-msgdb-create-entity (msgdb dir number)
   (elmo-msgdb-create-message-entity-from-file
    (elmo-msgdb-message-entity-handler msgdb)
-   number (expand-file-name (int-to-string number) dir)))
+   number (expand-file-name (number-to-string number) dir)))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
                                              numbers
@@ -177,7 +177,7 @@
     one-level)))
 
 (defsubst elmo-localdir-list-subr (folder &optional nonsort)
-  (let ((flist (mapcar 'string-to-int
+  (let ((flist (mapcar 'string-to-number
                       (directory-files
                        (elmo-localdir-folder-directory-internal folder)
                        nil "^[0-9]+$" t)))
@@ -219,7 +219,7 @@
       (elmo-copy-file
        (elmo-message-file-name src-folder (car numbers))
        (expand-file-name
-       (int-to-string
+       (number-to-string
         (if same-number (car numbers) next-num))
        dir))
       ;; save flag-table only when src folder's msgdb is loaded.
@@ -258,9 +258,9 @@
 (luna-define-method elmo-message-fetch-internal ((folder elmo-localdir-folder)
                                                 number strategy
                                                 &optional section unread)
-  (when (file-exists-p (elmo-message-file-name folder number))
-    (insert-file-contents-as-binary
-     (elmo-message-file-name folder number))))
+  (let ((filename (elmo-message-file-name folder number)))
+    (when (file-exists-p filename)
+      (insert-file-contents-as-raw-text filename))))
 
 (luna-define-method elmo-folder-list-messages-internal
   ((folder elmo-localdir-folder) &optional nohide)
@@ -332,8 +332,8 @@
          (elmo-bind-directory
           dir
           ;; xxx  nfs,hardlink
-          (rename-file (int-to-string old-number)
-                       (int-to-string new-number) t))
+          (rename-file (number-to-string old-number)
+                       (number-to-string new-number) t))
          (elmo-message-entity-set-number entity new-number))
        (elmo-msgdb-append-entity new-msgdb entity
                                  (elmo-msgdb-flags msgdb old-number))