* wl-folder.el (wl-folder-confirm-existence): Don't call

file-exists-p if msgdb-path is nil.
* wl-summary.el, wl-draft.el, wl-action.el: Rename
`wl-read-folder-hist' to `wl-read-folder-history'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c86a203..a2b65e4 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-21  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-folder.el (wl-folder-confirm-existence): Don't call
+       file-exists-p if msgdb-path is nil.
+       * wl-summary.el, wl-draft.el, wl-action.el: Rename
+       `wl-read-folder-hist' to `wl-read-folder-history'.
+
 2003-09-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-draft.el (wl-draft-kill): Use `yes-or-no-p' instead of

diff --git a/wl/wl-action.el b/wl/wl-action.el
index 4fc32a4..a7d409a 100644 (file)
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -711,7 +711,7 @@ Return number if put mark succeed"
                      default)
              'wl-folder-complete-folder
              nil nil (or init wl-default-spec)
-             'wl-read-folder-hist)))
+             'wl-read-folder-history)))
     (if (or (string= fld wl-default-spec)
            (string= fld ""))
        (setq fld default))

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index b4ab483..bcf88d9 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -642,7 +642,7 @@ Reply to author if WITH-ARG is non-nil."
                  (wl-folder-get-entity-with-petname)
                wl-folder-entity-hashtb)
              nil nil wl-default-spec
-             'wl-read-folder-hist))
+             'wl-read-folder-history))
        (number (call-interactively
                 (function (lambda (num)
                             (interactive "nNumber: ")
@@ -1536,8 +1536,8 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
                         (progn (forward-line 1) (point)))))
       fcc-list)))
 
-(defcustom wl-draft-fcc-append-read-folder-hist t
-  "Non-nil to append fcc'ed folder to `wl-read-folder-hist'."
+(defcustom wl-draft-fcc-append-read-folder-history t
+  "Non-nil to append fcc'ed folder to `wl-read-folder-history'."
   :type 'boolean
   :group 'wl-draft)
 
@@ -1574,10 +1574,10 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
              (wl-draft-write-sendlog 'ok 'fcc nil (car fcc-list) id)
            (wl-draft-write-sendlog 'failed 'fcc nil (car fcc-list) id))
          (if (and wl-draft-fcc-append-read-folder-hist
-                  (boundp 'wl-read-folder-hist))
-             (or (equal (car fcc-list) (car wl-read-folder-hist))
-                 (setq wl-read-folder-hist
-                       (append (list (car fcc-list)) wl-read-folder-hist))))
+                  (boundp 'wl-read-folder-history))
+             (or (equal (car fcc-list) (car wl-read-folder-history))
+                 (setq wl-read-folder-history
+                       (append (list (car fcc-list)) wl-read-folder-history))))
          (setq fcc-list (cdr fcc-list)))))
     (kill-buffer tembuf)))
 
@@ -2455,8 +2455,8 @@ Automatically applied in draft sending time."
                   (forward-line -1))
                 (cond
                  ((looking-at wl-folder-complete-header-regexp)
-                  (and (boundp 'wl-read-folder-hist)
-                       (setq history wl-read-folder-hist)))
+                  (and (boundp 'wl-read-folder-history)
+                       (setq history wl-read-folder-history)))
                  ;; ((looking-at wl-address-complete-header-regexp)
                  ;;  (setq history .....))
                  (t

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index e61f07b..565c48c 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -2856,7 +2856,8 @@ Call `wl-summary-write-current-folder' with current folder name."
       (unless (elmo-folder-exists-p folder)
        (wl-folder-create-subr folder))
     (unless (or (wl-folder-entity-exists-p (elmo-folder-name-internal folder))
-               (file-exists-p (elmo-folder-msgdb-path folder))
+               (and (elmo-folder-msgdb-path folder)
+                    (file-exists-p (elmo-folder-msgdb-path folder)))
                (elmo-folder-exists-p folder))
       (wl-folder-create-subr folder))))
 

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index b2a0f02..c2bc638 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -114,7 +114,7 @@
 (defvar wl-thread-horizontal-str-internal nil)
 (defvar wl-thread-space-str-internal nil)
 (defvar wl-summary-last-visited-folder nil)
-(defvar wl-read-folder-hist nil)
+(defvar wl-read-folder-history nil)
 (defvar wl-summary-scored nil)
 (defvar wl-crosspost-alist-modified nil)
 (defvar wl-summary-alike-hashtb nil)