* wl-acap.el (wl-acap-original-msgdb-directory): Renamed from

`wl-acap-original-msgdb-dir'.

* wl-vars.el (wl-icon-directory): Renamed from `wl-icon-dir'.
(wl-score-files-directory): Renamed from `wl-score-fiels-dir'.

* wl-mime.el (wl-mime-save-directory): Renamed from
`wl-mime-save-directory'.

* elmo.el (elmo-folder-make-temporary-directory): Renamed from
`elmo-folder-make-temp-dir'

* elmo-vars.el (elmo-cache-directory): New variable.
(elmo-cache-dir): Abolished.
(elmo-msgdb-directory): Renamed from `elmo-msgdb-directory'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index e89cf51..c46122c 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,4 +1,11 @@
-2001-12-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+2001-12-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * elmo.el (elmo-folder-make-temporary-directory): Renamed from
+       `elmo-folder-make-temp-dir'
+
+       * elmo-vars.el (elmo-cache-directory): New variable.
+       (elmo-cache-dir): Abolished.
+       (elmo-msgdb-directory): Renamed from `elmo-msgdb-directory'.
 
        * elmo-version.el (elmo-version): Up to 2.7.7.
 

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 30cae35..6625a7f 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -116,7 +116,7 @@
                             (symbol-name
                              (elmo-archive-folder-archive-type-internal
                               folder)))
-                    elmo-msgdb-dir)))
+                    elmo-msgdb-directory)))
 
 ;;; MMDF parser -- info-zip agent w/ REXX
 (defvar elmo-mmdf-delimiter "^\01\01\01\01$"
@@ -652,8 +652,8 @@ TYPE specifies the archiver's symbol."
 (defun elmo-archive-folder-message-make-temp-files (folder
                                                    numbers
                                                    start-number)
-  (let* ((tmp-dir-src (elmo-folder-make-temp-dir folder))
-        (tmp-dir-dst (elmo-folder-make-temp-dir folder))
+  (let* ((tmp-dir-src (elmo-folder-make-temporary-directory folder))
+        (tmp-dir-dst (elmo-folder-make-temporary-directory folder))
         (arc     (elmo-archive-get-archive-name folder))
         (type    (elmo-archive-folder-archive-type-internal folder))
         (prefix  (elmo-archive-folder-archive-prefix-internal folder))

diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el
index 5587e32..2824f85 100644 (file)
--- a/elmo/elmo-cache.el
+++ b/elmo/elmo-cache.el
@@ -52,13 +52,13 @@
     (elmo-cache-folder-set-directory-internal
      folder
      (expand-file-name (elmo-match-string 2 name)
-                      (expand-file-name elmo-cache-dirname elmo-msgdb-dir)))
+                      elmo-cache-directory))
     folder))
 
 (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-cache-folder))
   (expand-file-name (elmo-cache-folder-dir-name-internal folder)
                    (expand-file-name "internal/cache"
-                                     elmo-msgdb-dir)))
+                                     elmo-msgdb-directory)))
 
 (luna-define-method elmo-map-folder-list-message-locations
   ((folder elmo-cache-folder))

diff --git a/elmo/elmo-database.el b/elmo/elmo-database.el
index defccca..55bf2de 100644 (file)
--- a/elmo/elmo-database.el
+++ b/elmo/elmo-database.el
@@ -39,7 +39,7 @@
                (database-live-p (symbol-value dbsym))))
       (set dbsym (open-database (expand-file-name
                                 dbname
-                                elmo-msgdb-dir
+                                elmo-msgdb-directory
                                 )))
     (symbol-value dbsym)))
 

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 9befea4..abaf702 100644 (file)
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -62,7 +62,7 @@
                                                    elmo-filter-folder))
   (expand-file-name
    (elmo-replace-string-as-filename (elmo-folder-name-internal folder))
-   (expand-file-name "filter" elmo-msgdb-dir)))
+   (expand-file-name "filter" elmo-msgdb-directory)))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-filter-folder))
   (elmo-folder-newsgroups (elmo-filter-folder-target-internal folder)))

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 7dbaba6..f59cddb 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1802,7 +1802,7 @@ Return nil if no complete line has arrived."
                             "nowhere")
                         (expand-file-name
                          "imap"
-                         elmo-msgdb-dir)))))))
+                         elmo-msgdb-directory)))))))
 
 (luna-define-method elmo-folder-status-plugged ((folder
                                                 elmo-imap4-folder))

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 0fb039e..3f8c916 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -96,7 +96,7 @@
     "/")
    (expand-file-name ;;"localdir"
     (symbol-name (elmo-folder-type-internal folder))
-    elmo-msgdb-dir)))
+    elmo-msgdb-directory)))
 
 (luna-define-method elmo-message-file-name ((folder
                                             elmo-localdir-folder)
@@ -121,7 +121,7 @@
                                                         numbers
                                                         &optional
                                                         start-number)
-  (let ((temp-dir (elmo-folder-make-temp-dir folder))
+  (let ((temp-dir (elmo-folder-make-temporary-directory folder))
        (cur-number (or start-number 0)))
     (dolist (number numbers)
       (elmo-add-name-to-file

diff --git a/elmo/elmo-localnews.el b/elmo/elmo-localnews.el
index 8468818..6908d81 100644 (file)
--- a/elmo/elmo-localnews.el
+++ b/elmo/elmo-localnews.el
@@ -56,7 +56,7 @@
    (elmo-localnews-folder-group-internal folder)
    (expand-file-name
     (symbol-name (elmo-folder-type-internal folder))
-    elmo-msgdb-dir)))
+    elmo-msgdb-directory)))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-localnews-folder))
   (list (elmo-localnews-folder-group-internal folder)))

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index c53ee3a..7fdae4c 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -58,12 +58,12 @@
 
 (luna-define-method elmo-folder-expand-msgdb-path ((folder
                                                    elmo-maildir-folder))
-  (expand-file-name 
-   (elmo-replace-string-as-filename 
+  (expand-file-name
+   (elmo-replace-string-as-filename
     (elmo-maildir-folder-directory-internal folder))
    (expand-file-name
     "maildir"
-    elmo-msgdb-dir)))
+    elmo-msgdb-directory)))
 
 (defun elmo-maildir-message-file-name (folder location)
   "Get a file name of the message from FOLDER which corresponded to
@@ -377,7 +377,7 @@ file name for maildir directories."
                                                         numbers
                                                         &optional
                                                         start-number)
-  (let ((temp-dir (elmo-folder-make-temp-dir folder))
+  (let ((temp-dir (elmo-folder-make-temporary-directory folder))
        (cur-number (if start-number 0)))
     (dolist (number numbers)
       (elmo-copy-file

diff --git a/elmo/elmo-mark.el b/elmo/elmo-mark.el
index 5f5b0f9..35352db 100644 (file)
--- a/elmo/elmo-mark.el
+++ b/elmo/elmo-mark.el
@@ -56,7 +56,7 @@
                                                    elmo-mark-folder))
   (expand-file-name "mark"
                    (expand-file-name "internal"
-                                     elmo-msgdb-dir)))
+                                     elmo-msgdb-directory)))
 
 (luna-define-method elmo-map-folder-list-message-locations
   ((folder elmo-mark-folder))
@@ -69,7 +69,7 @@
                            (elmo-object-load
                             (expand-file-name
                              elmo-msgdb-global-mark-filename
-                             elmo-msgdb-dir)))))
+                             elmo-msgdb-directory)))))
       (if (string= (elmo-mark-folder-mark-internal folder)
                   (cdr pair))
          (setq result (cons (car pair) result))))

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index d3aca19..0ca535d 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -73,7 +73,7 @@
 (defun elmo-msgdb-global-mark-delete (msgid)
   (let* ((path (expand-file-name
                elmo-msgdb-global-mark-filename
-               elmo-msgdb-dir))
+               elmo-msgdb-directory))
         (malist (or elmo-msgdb-global-mark-alist
                     (setq elmo-msgdb-global-mark-alist
                           (elmo-object-load path))))
@@ -86,7 +86,7 @@
 (defun elmo-msgdb-global-mark-set (msgid mark)
   (let* ((path (expand-file-name
                elmo-msgdb-global-mark-filename
-               elmo-msgdb-dir))
+               elmo-msgdb-directory))
         (malist (or elmo-msgdb-global-mark-alist
                     (setq elmo-msgdb-global-mark-alist
                           (elmo-object-load path))))
@@ -104,7 +104,7 @@
                              (elmo-object-load
                               (expand-file-name
                                elmo-msgdb-global-mark-filename
-                               elmo-msgdb-dir)))))))
+                               elmo-msgdb-directory)))))))
 
 ;;;
 ;; persistent mark handling
@@ -560,13 +560,13 @@ content of MSGDB is changed."
 (defun elmo-msgdb-finfo-load ()
   (elmo-object-load (expand-file-name
                     elmo-msgdb-finfo-filename
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    elmo-mime-charset t))
 
 (defun elmo-msgdb-finfo-save (finfo)
   (elmo-object-save (expand-file-name
                     elmo-msgdb-finfo-filename
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    finfo elmo-mime-charset))
 
 (defun elmo-msgdb-flist-load (fname)
@@ -574,7 +574,7 @@ content of MSGDB is changed."
                     elmo-msgdb-flist-filename
                     (expand-file-name
                      (elmo-safe-filename fname)
-                     (expand-file-name "folder" elmo-msgdb-dir)))))
+                     (expand-file-name "folder" elmo-msgdb-directory)))))
     (elmo-object-load flist-file elmo-mime-charset t)))
 
 (defun elmo-msgdb-flist-save (fname flist)
@@ -582,19 +582,19 @@ content of MSGDB is changed."
                     elmo-msgdb-flist-filename
                     (expand-file-name
                      (elmo-safe-filename fname)
-                     (expand-file-name "folder" elmo-msgdb-dir)))))
+                     (expand-file-name "folder" elmo-msgdb-directory)))))
     (elmo-object-save flist-file flist elmo-mime-charset)))
 
 (defun elmo-crosspost-alist-load ()
   (elmo-object-load (expand-file-name
                     elmo-crosspost-alist-filename
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    nil t))
 
 (defun elmo-crosspost-alist-save (alist)
   (elmo-object-save (expand-file-name
                     elmo-crosspost-alist-filename
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    alist))
 
 (defun elmo-msgdb-add-msgs-to-seen-list (msgs msgdb unread-marks seen-list)

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 6ab6ef3..546dd60 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -76,7 +76,7 @@
   (expand-file-name (elmo-replace-string-as-filename
                     (elmo-folder-name-internal folder))
                    (expand-file-name "multi"
-                                     elmo-msgdb-dir)))
+                                     elmo-msgdb-directory)))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-multi-folder))
   (delq nil

diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index 9a9a9fe..e690a8e 100644 (file)
--- a/elmo/elmo-nmz.el
+++ b/elmo/elmo-nmz.el
@@ -92,7 +92,7 @@ If the value is a list, all elements are used as index paths for namazu."
   (expand-file-name
    (elmo-replace-string-as-filename
     (elmo-folder-name-internal folder))
-   (expand-file-name "nmz" elmo-msgdb-dir)))
+   (expand-file-name "nmz" elmo-msgdb-directory)))
 
 (defun elmo-nmz-msgdb-create-entity (folder number)
   "Create msgdb entity for the message in the FOLDER with NUMBER."
@@ -175,7 +175,7 @@ If the value is a list, all elements are used as index paths for namazu."
                                                         numbers
                                                         &optional
                                                         start-number)
-  (let ((temp-dir (elmo-folder-make-temp-dir folder))
+  (let ((temp-dir (elmo-folder-make-temporary-directory folder))
        (cur-number (if start-number 0)))
     (dolist (number numbers)
       (elmo-add-name-to-file

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 7acd49c..8cd3d60 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -109,7 +109,7 @@
     (elmo-nntp-folder-group-internal folder)
     (expand-file-name (or (elmo-net-folder-server-internal folder) "nowhere")
                      (expand-file-name "nntp"
-                                       elmo-msgdb-dir)))))
+                                       elmo-msgdb-directory)))))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-nntp-folder))
   (list (elmo-nntp-folder-group-internal folder)))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index e0b3993..259c311 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -434,7 +434,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
     (expand-file-name (elmo-net-folder-server-internal folder)
                      (expand-file-name
                       "pop"
-                      elmo-msgdb-dir)))))
+                      elmo-msgdb-directory)))))
 
 (luna-define-method elmo-folder-exists-p ((folder elmo-pop3-folder))
   (if (and elmo-pop3-exists-exactly

diff --git a/elmo/elmo-sendlog.el b/elmo/elmo-sendlog.el
index 79be027..87885fb 100644 (file)
--- a/elmo/elmo-sendlog.el
+++ b/elmo/elmo-sendlog.el
@@ -47,7 +47,7 @@
 (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-sendlog-folder))
   (expand-file-name "sendlog"
                    (expand-file-name "internal"
-                                     elmo-msgdb-dir)))
+                                     elmo-msgdb-directory)))
 
 (luna-define-method elmo-map-folder-list-message-locations
   ((folder elmo-sendlog-folder))
@@ -55,13 +55,13 @@
 
 (defun elmo-sendlog-folder-list-message-locations (folder)
   (let ((filename (expand-file-name elmo-sendlog-filename
-                                   elmo-msgdb-dir))
+                                   elmo-msgdb-directory))
        result)
     (if (not (file-readable-p filename))
-        nil
+       nil
       (elmo-set-work-buf
        (as-binary-input-file
-        (insert-file-contents filename))
+       (insert-file-contents filename))
        (goto-char (point-min))
        (catch 'done
         (while t
@@ -205,4 +205,4 @@
 (require 'product)
 (product-provide (provide 'elmo-sendlog) (require 'elmo-version))
 
-;;; elmo-sendlog.el ends here
\ No newline at end of file
+;;; elmo-sendlog.el ends here

diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index f109727..b690aba 100644 (file)
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -308,7 +308,7 @@ update overview when message is fetched."
            (elmo-shimbun-folder-shimbun-internal folder))
           "/"
           (elmo-shimbun-folder-group-internal folder))
-   (expand-file-name "shimbun" elmo-msgdb-dir)))
+   (expand-file-name "shimbun" elmo-msgdb-directory)))
 
 (defun elmo-shimbun-msgdb-create-entity (folder number)
   (let ((header (elmo-get-hash-val

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 0be8261..ae2512b 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -390,7 +390,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
 (defun elmo-passwd-alist-load ()
   (save-excursion
     (let ((filename (expand-file-name elmo-passwd-alist-file-name
-                                     elmo-msgdb-dir))
+                                     elmo-msgdb-directory))
          (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*"))
          insert-file-contents-pre-hook ; To avoid autoconv-xmas...
          insert-file-contents-post-hook
@@ -416,7 +416,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
   (interactive)
   (save-excursion
     (let ((filename (expand-file-name elmo-passwd-alist-file-name
-                                     elmo-msgdb-dir))
+                                     elmo-msgdb-directory))
          (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*")))
       (set-buffer tmp-buffer)
       (erase-buffer)
@@ -711,7 +711,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
     (if (null (file-directory-p parent))
        (elmo-make-directory parent))
     (make-directory path)
-    (if (string= path (expand-file-name elmo-msgdb-dir))
+    (if (string= path (expand-file-name elmo-msgdb-directory))
        (set-file-modes path (+ (* 64 7) (* 8 0) 0))))) ; chmod 0700
 
 (defun elmo-delete-directory (path &optional no-hierarchy)
@@ -1547,15 +1547,13 @@ If optional argument SECTION is specified, partial cache path is returned."
   (if (setq msgid (elmo-msgid-to-cache msgid))
       (expand-file-name
        (if section
-          (format "%s/%s/%s/%s/%s"
-                  elmo-msgdb-dir
-                  elmo-cache-dirname
+          (format "%s/%s/%s/%s"
+                  elmo-cache-directory
                   (elmo-cache-get-path-subr msgid)
                   msgid
                   section)
-        (format "%s/%s/%s/%s"
-                elmo-msgdb-dir
-                elmo-cache-dirname
+        (format "%s/%s/%s"
+                elmo-cache-directory
                 (elmo-cache-get-path-subr msgid)
                 msgid)))))
 
@@ -1677,8 +1675,7 @@ If KBYTES is kilo bytes (This value must be float)."
        total beginning)
     (message "Checking disk usage...")
     (setq total (/ (elmo-disk-usage
-                   (expand-file-name
-                    elmo-cache-dirname elmo-msgdb-dir)) Kbytes))
+                   elmo-cache-directory) Kbytes))
     (setq beginning total)
     (message "Checking disk usage...done")
     (let ((cfl (elmo-cache-get-sorted-cache-file-list))
@@ -1726,7 +1723,7 @@ If KBYTES is kilo bytes (This value must be float)."
 
 (defun elmo-cache-get-sorted-cache-file-list ()
   (let ((dirs (directory-files
-              (expand-file-name elmo-cache-dirname elmo-msgdb-dir)
+              elmo-cache-directory
               t "^[^\\.]"))
        (i 0) num
        elist
@@ -1762,7 +1759,7 @@ If KBYTES is kilo bytes (This value must be float)."
                               elmo-cache-expire-default-age)))
                 (int-to-string elmo-cache-expire-default-age)))
        (dirs (directory-files
-              (expand-file-name elmo-cache-dirname elmo-msgdb-dir)
+              elmo-cache-directory
               t "^[^\\.]"))
        (count 0)
        curtime)
@@ -1806,8 +1803,7 @@ If KBYTES is kilo bytes (This value must be float)."
          (format "%s/%s"
                  (elmo-cache-get-path-subr msgid)
                  msgid))
-       (expand-file-name elmo-cache-dirname
-                         elmo-msgdb-dir)))))
+       elmo-cache-directory))))
 
 ;;;
 ;; Warnings.
@@ -1871,12 +1867,12 @@ If ALIST is nil, `elmo-obsolete-variable-alist' is used."
   (setq elmo-dop-queue
        (elmo-object-load
         (expand-file-name elmo-dop-queue-filename
-                          elmo-msgdb-dir))))
+                          elmo-msgdb-directory))))
 
 (defun elmo-dop-queue-save ()
   (elmo-object-save
    (expand-file-name elmo-dop-queue-filename
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
    elmo-dop-queue))
 
 (require 'product)

diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 5ed767f..9400912 100644 (file)
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -59,7 +59,7 @@ Each elements are regexp of folder name (This is obsolete).")
 (defvar elmo-msgdb-file-header-chop-length 2048
   "*Number of bytes to get header in one reading from file.")
 
-(defvar elmo-msgdb-dir "~/.elmo"
+(defvar elmo-msgdb-directory "~/.elmo"
   "*ELMO Message Database path.")
 (defvar elmo-passwd-alist-file-name "passwd"
   "*ELMO Password filename.")
@@ -321,7 +321,7 @@ Arguments for this function are NAME, BUFFER, HOST and SERVICE.")
 (defvar elmo-cache-expire-default-age 50
   "Cache expiration age (days).")
 
-(defvar elmo-cache-dirname "cache"
+(defvar elmo-cache-directory (expand-file-name "cache" elmo-msgdb-directory)
   "Directory name for cache storage.")
 
 (defvar elmo-pack-number-check-strict t

diff --git a/elmo/elmo.el b/elmo/elmo.el
index f5e55d9..0d6e307 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -246,7 +246,7 @@ IMPORTANT-MARK is the important mark."
                                 (elmo-object-load
                                  (expand-file-name
                                   elmo-msgdb-global-mark-filename
-                                  elmo-msgdb-dir)))))
+                                  elmo-msgdb-directory)))))
       (if (and (string= important-mark (cdr mark-pair))
               (setq num-pair (rassoc (car mark-pair) number-alist)))
          (setq result (cons (car num-pair) result))))
@@ -1404,7 +1404,7 @@ Return a hashtable for newsgroups."
       (elmo-crosspost-alist-save elmo-crosspost-message-alist)
       (setq elmo-crosspost-message-alist-modified nil))))
 
-(defun elmo-folder-make-temp-dir (folder)
+(defun elmo-folder-make-temporary-directory (folder)
   ;; Make a temporary directory for FOLDER.
   (let ((temp-dir (make-temp-name
                   (concat
@@ -1477,6 +1477,17 @@ Return a hashtable for newsgroups."
                               'elmo-pop3-default-authenticate-type)
 (elmo-define-obsolete-variable 'elmo-default-pop3-port
                               'elmo-pop3-default-port)
+(elmo-define-obsolete-variable 'elmo-cache-dirname
+                              'elmo-cache-directory)
+(elmo-define-obsolete-variable 'elmo-msgdb-dir
+                              'elmo-msgdb-directory)
+
+;; Obsolete functions.
+;; 2001-12-11: *-dir -> *-directory
+(defalias 'elmo-folder-make-temporary-directory 'elmo-folder-make-temp-dir)
+(make-obsolete 'elmo-folder-make-temp-dir
+              'elmo-folder-make-temporary-directory)
+
 
 ;; autoloads
 (autoload 'elmo-dop-queue-flush "elmo-dop")

diff --git a/utils/wl-addrbook.el b/utils/wl-addrbook.el
index a650467..f71f928 100644 (file)
--- a/utils/wl-addrbook.el
+++ b/utils/wl-addrbook.el
@@ -151,7 +151,7 @@ If nil,  the old 'user' entry remains.")
          (setq wl-alias-auto-alist
                (elmo-object-load (expand-file-name
                                   wl-alias-auto-file-name
-                                  elmo-msgdb-dir)))))
+                                  elmo-msgdb-directory)))))
   (setq wl-addrbook-alist (wl-addrbook-make-alist))
   ;; wl-alias-auto-alist is used independently so must use copy-alist
   (if wl-addrbook-alist
@@ -172,7 +172,7 @@ If nil,  the old 'user' entry remains.")
   (when wl-alias-auto-file-name
     (elmo-object-save (expand-file-name
                       wl-alias-auto-file-name
-                      elmo-msgdb-dir)
+                      elmo-msgdb-directory)
                      wl-alias-auto-alist)
     (setq wl-alias-auto-alist nil)
     (setq wl-addrbook-hashtb nil)))

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 9c1e123..7ec0f12 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl-acap.el (wl-acap-original-msgdb-directory): Renamed from
+       `wl-acap-original-msgdb-dir'.
+
+       * wl-vars.el (wl-icon-directory): Renamed from `wl-icon-dir'.
+       (wl-score-files-directory): Renamed from `wl-score-fiels-dir'.
+
+       * wl-mime.el (wl-mime-save-directory): Renamed from
+       `wl-mime-save-directory'.
+
 2001-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * wl-vars.el (wl-icon-dir): Fixed the docstring.

diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index 62ab754..eb4901e 100644 (file)
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -96,15 +96,15 @@ If nil, default acap port is used."
   :type 'symbol
   :group 'wl)
 
-(defvar wl-acap-original-msgdb-dir nil)
+(defvar wl-acap-original-msgdb-directory nil)
 
 (defun wl-acap-exit ()
   "End ACAP session."
-  (setq elmo-msgdb-dir wl-acap-original-msgdb-dir))
-  
+  (setq elmo-msgdb-directory wl-acap-original-msgdb-directory))
+
 (defun wl-acap-init ()
   "A candidate for `wl-folder-init-function'."
-  (setq wl-acap-original-msgdb-dir nil)
+  (setq wl-acap-original-msgdb-directory nil)
   (condition-case nil ; catch error and quit.
   (let ((service (wl-acap-find-acap-service))
        proc entries settings folder-top type)
@@ -169,16 +169,16 @@ If nil, default acap port is used."
     (dolist (setting settings)
       (set (car setting) (cdr setting)))
     ;; Database directory becomes specific to the ACAP server.
-    (setq wl-acap-original-msgdb-dir elmo-msgdb-dir)
-    (setq elmo-msgdb-dir (expand-file-name
-                         (concat "acap/" (car service) "/" wl-acap-user)
-                         elmo-msgdb-dir))
+    (setq wl-acap-original-msgdb-directory elmo-msgdb-directory)
+    (setq elmo-msgdb-directory (expand-file-name
+                               (concat "acap/" (car service) "/" wl-acap-user)
+                               elmo-msgdb-directory))
     (acap-close proc))
-  (error (when wl-acap-original-msgdb-dir
-          (setq elmo-msgdb-dir wl-acap-original-msgdb-dir)))
-  (quit (when wl-acap-original-msgdb-dir
-         (setq elmo-msgdb-dir wl-acap-original-msgdb-dir)))))
-  
+  (error (when wl-acap-original-msgdb-directory
+          (setq elmo-msgdb-directory wl-acap-original-msgdb-directory)))
+  (quit (when wl-acap-original-msgdb-directory
+         (setq elmo-msgdb-directory wl-acap-original-msgdb-directory)))))
+
 
 (defun wl-acap-create-folder-entity (string)
   (with-temp-buffer

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index d1c0a47..19d26d6 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -143,10 +143,10 @@ Return a number of lines that an image occupies in the buffer."
       (set-specifier (symbol-value 'scrollbar-height) 0 (current-buffer))
       (set-specifier (symbol-value 'scrollbar-width) 0 (current-buffer)))
     (if (and file
-            (if (and wl-icon-dir
-                     (file-directory-p wl-icon-dir))
-                (setq file (expand-file-name file wl-icon-dir))
-              (message "You have to specify the value of `wl-icon-dir'")
+            (if (and wl-icon-directory
+                     (file-directory-p wl-icon-directory))
+                (setq file (expand-file-name file wl-icon-directory))
+              (message "You have to specify the value of `wl-icon-directory'")
               nil)
             (if (file-exists-p file)
                 (if (file-readable-p file)

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index c30d60f..d6d28d7 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -508,7 +508,8 @@ Reply to author if WITH-ARG is non-nil."
   (wl-draft-edit-string (elmo-get-file-string
                         (or file
                             (read-file-name "File to edit: "
-                                            (or wl-tmp-dir "~/"))))))
+                                            (or wl-temporary-file-directory
+                                                "~/"))))))
 
 (defun wl-draft-edit-string (string)
   (let ((cur-buf (current-buffer))
@@ -761,7 +762,7 @@ Reply to author if WITH-ARG is non-nil."
   (when wl-draft-sendlog
     (with-temp-buffer
       (let* ((filename (expand-file-name wl-draft-sendlog-filename
-                                        elmo-msgdb-dir))
+                                        elmo-msgdb-directory))
             (filesize (nth 7 (file-attributes filename)))
             (server (if server (concat " server=" server) ""))
             (to (if to (cond

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 11b8939..e33d3fe 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -33,7 +33,7 @@
 ;;(let (image icon from to overlay)
 ;;  ;; The function `find-image' will look for an image first on `load-path'
 ;;  ;; and then in `data-directory'.
-;;  (let ((load-path (cons wl-icon-dir load-path)))
+;;  (let ((load-path (cons wl-icon-directory load-path)))
 ;;    (setq image (find-image (list (list :type 'xpm :file wl-nntp-folder-icon
 ;;                                     :ascent 'center)))))
 ;;  ;; `propertize' is a convenient function in such a case.
@@ -176,7 +176,7 @@
 (defun wl-e21-setup-toolbar (bar)
   (when (and wl-use-toolbar
             (wl-e21-display-image-p))
-    (let ((load-path (cons wl-icon-dir load-path))
+    (let ((load-path (cons wl-icon-directory load-path))
          (props '(:type xpm :ascent center
                         :color-symbols (("backgroundToolBarColor" . "None"))
                         :file))
@@ -260,7 +260,7 @@
          (unless image
            (let ((name (symbol-value
                         (cdr (assq icon wl-folder-toggle-icon-list))))
-                 (load-path (cons wl-icon-dir load-path)))
+                 (load-path (cons wl-icon-directory load-path)))
              (when (setq image (find-image `((:type xpm :file ,name
                                                     :ascent center))))
                (setq image (put icon 'image (propertize name
@@ -444,7 +444,7 @@
 
 (defun wl-folder-init-icons ()
   (when (wl-e21-display-image-p)
-    (let ((load-path (cons wl-icon-dir load-path))
+    (let ((load-path (cons wl-icon-directory load-path))
          (icons wl-folder-internal-icon-list)
          icon name image)
       (while (setq icon (pop icons))
@@ -462,7 +462,7 @@
     (if (wl-e21-display-image-p)
        (progn
          (unless wl-plugged-image
-           (let ((load-path (cons wl-icon-dir load-path)))
+           (let ((load-path (cons wl-icon-directory load-path)))
              (setq wl-plugged-image (find-image
                                      `((:type xpm
                                               :file ,wl-plugged-icon
@@ -493,7 +493,7 @@
     (if (wl-e21-display-image-p)
        (progn
          (unless wl-biff-mail-image
-           (let ((load-path (cons wl-icon-dir load-path)))
+           (let ((load-path (cons wl-icon-directory load-path)))
              (setq wl-biff-mail-image (find-image
                                        `((:type xpm
                                                 :file ,wl-biff-mail-icon

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 5852fd5..e3fc142 100644 (file)
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -49,12 +49,12 @@
 (defun wl-expired-alist-load ()
   (elmo-object-load (expand-file-name
                     wl-expired-alist-file-name
-                    elmo-msgdb-dir)))
+                    elmo-msgdb-directory)))
 
 (defun wl-expired-alist-save (&optional alist)
   (elmo-object-save (expand-file-name
                     wl-expired-alist-file-name
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    (or alist wl-expired-alist)))
 
 (defsubst wl-expire-msg-p (msg-num mark-alist)
@@ -867,7 +867,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
     (save-excursion
       (let ((tmp-buf (get-buffer-create " *wl-expire work*"))
            (filename (expand-file-name wl-expired-log-alist-file-name
-                                       elmo-msgdb-dir)))
+                                       elmo-msgdb-directory)))
        (set-buffer tmp-buf)
        (erase-buffer)
        (if dst-folder

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index ab69ce2..3dcfed6 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -203,22 +203,22 @@ By setting following-method as yank-content."
     (wl-summary-sync-update)))
 
 ;; internal variable.
-(defvar wl-mime-save-dir nil "Last saved directory.")
+(defvar wl-mime-save-directory nil "Last saved directory.")
 ;;; Yet another save method.
 (defun wl-mime-save-content (entity situation)
   (let ((filename (read-file-name "Save to file: "
                                  (expand-file-name
                                   (or (mime-entity-safe-filename entity)
                                       ".")
-                                  (or wl-mime-save-dir
-                                      wl-tmp-dir)))))
+                                  (or wl-mime-save-directory
+                                      wl-temporary-file-directory)))))
     (while (file-directory-p filename)
       (setq filename (read-file-name "Please set filename (not directory): "
                                     filename)))
     (if (file-exists-p filename)
        (or (yes-or-no-p (format "File %s exists. Save anyway? " filename))
            (error "Not saved")))
-    (setq wl-mime-save-dir (file-name-directory filename))
+    (setq wl-mime-save-directory (file-name-directory filename))
     (mime-write-entity-content entity filename)))
 
 ;;; Yet another combine method.

diff --git a/wl/wl-refile.el b/wl/wl-refile.el
index c8b5f53..bba8e51 100644 (file)
--- a/wl/wl-refile.el
+++ b/wl/wl-refile.el
@@ -50,17 +50,17 @@
        (setq wl-refile-alist
              (elmo-object-load
               (expand-file-name wl-refile-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset)))
+                                elmo-msgdb-directory) elmo-mime-charset)))
        ((eq (car flist) 'wl-refile-guess-by-msgid)
        (setq wl-refile-msgid-alist
              (elmo-object-load
               (expand-file-name wl-refile-msgid-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset)))
+                                elmo-msgdb-directory) elmo-mime-charset)))
        ((eq (car flist) 'wl-refile-guess-by-subject)
        (setq wl-refile-subject-alist
              (elmo-object-load
               (expand-file-name wl-refile-subject-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset))))
+                                elmo-msgdb-directory) elmo-mime-charset))))
       (setq flist (cdr flist)))))
 
 (defun wl-refile-alist-save ()
@@ -77,7 +77,7 @@
 (defun wl-refile-alist-save-file (file-name alist)
   (if (> (length alist) wl-refile-alist-max-length)
       (setcdr (nthcdr (1- wl-refile-alist-max-length) alist) nil))
-  (elmo-object-save (expand-file-name file-name elmo-msgdb-dir)
+  (elmo-object-save (expand-file-name file-name elmo-msgdb-directory)
                    alist elmo-mime-charset))
 
 (defun wl-refile-learn (entity dst)

diff --git a/wl/wl-score.el b/wl/wl-score.el
index e3676e8..1826640 100644 (file)
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -310,12 +310,12 @@ Set `wl-score-cache' nil."
                (or (and (string-match
                          (concat "^" (regexp-quote
                                       (expand-file-name
-                                       wl-score-files-dir)))
+                                       wl-score-files-directory)))
                          (expand-file-name file))
                         file)
                    (expand-file-name
                     file
-                    (file-name-as-directory wl-score-files-dir)))))
+                    (file-name-as-directory wl-score-files-directory)))))
         (cached (assoc file wl-score-cache))
         alist)
     (if cached
@@ -859,7 +859,7 @@ Set `wl-score-cache' nil."
 (defun wl-score-change-score-file (file)
   "Change current score alist."
   (interactive
-   (list (read-file-name "Change to score file: " wl-score-files-dir)))
+   (list (read-file-name "Change to score file: " wl-score-files-directory)))
   (wl-score-load-file file))
 
 (defun wl-score-default (level)
@@ -1287,7 +1287,7 @@ Set `wl-score-cache' nil."
 (defun wl-score-edit-file (file)
   "Edit a score FILE."
   (interactive
-   (list (read-file-name "Edit score file: " wl-score-files-dir)))
+   (list (read-file-name "Edit score file: " wl-score-files-directory)))
   (when (wl-collect-summary)
     (wl-score-save))
   (let ((winconf (current-window-configuration))

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 97ed58c..68d1356 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3966,7 +3966,8 @@ If ARG, exit virtual folder."
   (save-excursion
     (goto-char (point-min))
     (let ((wl-save-dir
-          (wl-read-directory-name "Save to directory: " wl-tmp-dir))
+          (wl-read-directory-name "Save to directory: "
+                                  wl-temporary-file-directory))
          (regexp (concat "^" wl-summary-buffer-number-regexp "\\(\\*\\)"))
          number mlist)
       (if (null (file-exists-p wl-save-dir))
@@ -5369,7 +5370,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
   (let ((filename)
        (num (wl-summary-message-number)))
     (if (null wl-save-dir)
-       (setq wl-save-dir wl-tmp-dir))
+       (setq wl-save-dir wl-temporary-file-directory))
     (if num
        (save-excursion
          (setq filename (expand-file-name
@@ -5396,7 +5397,8 @@ Use function list is `wl-summary-write-current-folder-functions'."
       (narrow-to-region beg end)
       (goto-char (point-min))
       (let ((wl-save-dir
-            (wl-read-directory-name "Save to directory: " wl-tmp-dir)))
+            (wl-read-directory-name "Save to directory: "
+                                    wl-temporary-file-directory)))
        (if (null (file-exists-p wl-save-dir))
            (make-directory wl-save-dir))
        (if (eq wl-summary-buffer-view 'thread)
@@ -5553,15 +5555,15 @@ Use function list is `wl-summary-write-current-folder-functions'."
       (set-buffer tmp-buf)
       (message "Exec %s..." wl-prog-uudecode)
       (unwind-protect
-         (let ((decode-dir wl-tmp-dir))
+         (let ((decode-dir wl-temporary-file-directory))
            (if (not wl-prog-uudecode-no-stdout-option)
                (setq filename (read-file-name "Save to file: "
                                               (expand-file-name
                                                (elmo-safe-filename filename)
-                                               wl-tmp-dir)))
+                                               wl-temporary-file-directory)))
              (setq decode-dir
                    (wl-read-directory-name "Save to directory: "
-                                           wl-tmp-dir))
+                                           wl-temporary-file-directory))
              (setq filename (expand-file-name filename decode-dir)))
            (if (file-exists-p filename)
                (or (yes-or-no-p (format "File %s exists. Save anyway? "

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 88635ec..eb57167 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -158,17 +158,17 @@ If you don't have multiple e-mail addresses, you don't have to set this."
   :group 'wl
   :group 'wl-setting)
 
-(defcustom wl-tmp-dir "~/tmp/"
+(defcustom wl-temporary-file-directory "~/tmp/"
   "*Default temporary directory to save message, part."
   :type 'directory
   :group 'wl)
 
-(defcustom wl-icon-dir (if (fboundp 'locate-data-directory)
-                          (locate-data-directory "wl")
-                        (let ((icons (expand-file-name "wl/icons/"
-                                                       data-directory)))
-                          (if (file-directory-p icons)
-                              icons)))
+(defcustom wl-icon-directory (if (fboundp 'locate-data-directory)
+                                (locate-data-directory "wl")
+                              (let ((icons (expand-file-name "wl/icons/"
+                                                             data-directory)))
+                                (if (file-directory-p icons)
+                                    icons)))
   "*Directory to load the icon files from, or nil if none."
   :type '(choice (const :tag "none" nil)
                 string)
@@ -828,7 +828,7 @@ In sync-all or rescan."
   :type 'integer
   :group 'wl-score)
 
-(defcustom wl-score-files-dir (concat elmo-msgdb-dir elmo-path-sep)
+(defcustom wl-score-files-directory (concat elmo-msgdb-directory elmo-path-sep)
   "*Name of the directory where score files will be stored.
 (default \"~/.elmo\")."
   :type 'directory
@@ -2272,7 +2272,7 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (defvar wl-highlight-thread-indent-string-regexp "[^[<]*"
   "* A regexp string for thread indent...for highlight.")
 
-;; folder icons. filename relative to wl-icon-dir
+;; folder icons. filename relative to wl-icon-directory
 (defvar wl-opened-group-folder-icon "opened.xpm"
   "*Icon file for opened group folder.")
 (defvar wl-closed-group-folder-icon "closed.xpm"
@@ -2336,6 +2336,16 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 
 ;;;; Obsolete variables.
 
+;; 2001-12-11: *-dir -> *-directory
+(elmo-define-obsolete-variable 'wl-icon-dir
+                              'wl-icon-directory)
+(elmo-define-obsolete-variable 'wl-mime-save-dir
+                              'wl-mime-save-directory)
+(elmo-define-obsolete-variable 'wl-score-files-dir
+                              'wl-score-files-directory)
+(elmo-define-obsolete-variable 'wl-tmp-dir
+                              'wl-teporary-file-directory)
+
 ;; 2001-12-10
 (elmo-define-obsolete-variable 'wl-summary-update-confirm-threshold
                               'elmo-folder-update-threshold)
@@ -2379,10 +2389,6 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (elmo-define-obsolete-variable 'wl-summary-temp-above
                               'wl-summary-target-above)
 
-;; 2000-03-08
-(elmo-define-obsolete-variable 'wl-score-files-directory
-                              'wl-score-files-dir)
-
 ;; 1999-11-07: Unified with `wl-draft-config-alist'.
 (defvar wl-draft-prepared-config-alist nil)
 (make-obsolete-variable 'wl-draft-prepared-config-alist

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 86578ea..b60ba74 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -137,7 +137,7 @@
   "The Draft buffer toolbar.")
 
 (defun wl-xmas-setup-toolbar (bar)
-  (let ((dir wl-icon-dir)
+  (let ((dir wl-icon-directory)
        icon up down disabled name)
     (when dir
       (while bar
@@ -162,7 +162,7 @@
     (when wl-highlight-folder-with-icon
       (set-glyph-image glyph
                       (vector 'xpm :file (expand-file-name
-                                          icon-file wl-icon-dir))
+                                          icon-file wl-icon-directory))
                       locale tag-set 'prepend))
     glyph))
 

diff --git a/wl/wl.el b/wl/wl.el
index b449773..d97f640 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -740,11 +740,11 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
        (unless (elmo-folder-exists-p lost+found-folder)
          (elmo-folder-create lost+found-folder)))
       ;; tmp dir
-      (unless (file-exists-p wl-tmp-dir)
+      (unless (file-exists-p wl-temporary-file-directory)
        (if (y-or-n-p
             (format "Temp directory (to save multipart) %s does not exist, create it now? "
-                    wl-tmp-dir))
-           (make-directory wl-tmp-dir)
+                    wl-temporary-file-directory))
+           (make-directory wl-temporary-file-directory)
          (error "Temp directory is not created"))))))
 
 ;;;###autoload