* doc/wl-ja.texi, doc/wl.texi: Fixed description of wl-draft-use-cache.

(Pointed out by Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>)

* wl-vars.el (wl): Set custom-manual link as "wl-ja"
only if current language environment is japanese,

* wl-folder.el (wl-folder-jump-to-current-entity): Call
wl-folder-select-buffer when wl-summary-use-frame is non-nil.
(wl-folder-goto-folder-subr): Ditto.

* wl-draft.el (wl-draft-dispatch-message): Call `elmo-file-cache-get-path'.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 9d57b6d..8cb2d83 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -4257,7 +4257,7 @@ Non-nil \e$B$J$iJV?.%"%I%l%9$N\e(B @samp{To:}, @samp{Cc:} \e$B%U%#!<%k%I$KAj<j$N%U%
 @vindex wl-draft-use-cache
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U\e(B
 \e$B%i%0$G$9!#\e(BNon-nil \e$B$J$i%-%c%C%7%e$7$^$9!#$?$@$7\e(B @code{wl-insert-message-id}\e$B$,\e(B
-non-nil\e$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#\e(B
+nil \e$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#\e(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue

diff --git a/doc/wl.texi b/doc/wl.texi
index 21bc00e..bd5e6f3 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -4293,7 +4293,7 @@ sent off-line.
 @item wl-draft-use-cache
 @vindex wl-draft-use-cache
 The initial setting is @code{nil}. If the value is non-nil and
-@code{wl-insert-message-id} is non-nil, cache the message which is sent.
+@code{wl-insert-message-id} is nil, cache the message which is sent.
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue

diff --git a/wl/ChangeLog b/wl/ChangeLog
index ee0b3ed..cccc480 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-21  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-vars.el (wl): Set custom-manual link as "wl-ja"
+       only if current language environment is japanese,
+
+       * wl-folder.el (wl-folder-jump-to-current-entity): Call
+       wl-folder-select-buffer when wl-summary-use-frame is non-nil.
+       (wl-folder-goto-folder-subr): Ditto.
+
+       * wl-draft.el (wl-draft-dispatch-message): Call
+       `elmo-file-cache-get-path'.
+
 2001-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-summary.el (wl-summary-cursor-move): If return value of

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 7a3f01a..ff7781a 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1047,7 +1047,8 @@ If FORCE-MSGID, ignore 'wl-insert-message-id'."
        (if wl-draft-use-cache
            (let ((id (std11-field-body "Message-ID"))
                  (elmo-enable-disconnected-operation t))
-               (elmo-file-cache-save id nil)))
+             (elmo-file-cache-save (elmo-file-cache-get-path id)
+                                   nil)))
        ;; If one unplugged, append queue.
        (when (and unplugged-via
                   wl-sent-message-modified)

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index c4223fa..8dd6fc5 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -662,7 +662,7 @@ Optional argument ARG is repeart count."
                        wl-folder-buffer-cur-entity-id)))
       (let ((summary-buf (wl-summary-get-buffer-create fld-name arg))
            error-selecting)
-       (if wl-stay-folder-window
+       (if (or wl-stay-folder-window wl-summary-use-frame)
            (wl-folder-select-buffer summary-buf)
          (if (and summary-buf
                   (get-buffer-window summary-buf))
@@ -2202,7 +2202,7 @@ Use `wl-subscribed-mailing-list'."
             (setq id (wl-folder-get-entity-id entity)))
        (wl-folder-set-current-entity-id id))
     (setq summary-buf (wl-summary-get-buffer-create fld-name sticky))
-    (if wl-stay-folder-window
+    (if (or wl-stay-folder-window wl-summary-use-frame)
        (wl-folder-select-buffer summary-buf)
       (if (and summary-buf
               (get-buffer-window summary-buf))

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 64bf9a4..db74e22 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -42,7 +42,12 @@
 (defgroup wl nil
   "Wanderlust, a news and mail reading software."
   :tag "Wanderlust"
-  :link '(custom-manual "(wl-ja)Top")
+  :link '(custom-manual
+         (if (and (boundp 'current-language-environment)
+                  (string-equal "Japanese"
+                                (symbol-value 'current-language-environment)))
+             "(wl-ja)Top"
+           "(wl)Top"))
   :group 'news
   :group 'mail)