From 968c040e03736a3259a31ba048ba2f7cc208fcd1 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Thu, 21 Jun 2001 15:13:46 +0000
Subject: [PATCH] * 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.
---
 doc/wl-ja.texi  |    2 +-
 doc/wl.texi     |    2 +-
 wl/ChangeLog    |    9 +++++++++
 wl/wl-folder.el |    4 ++--
 wl/wl-vars.el   |    7 ++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 8b20c04..2bd9d54 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -4249,7 +4249,7 @@ Non-nil $B$J$iJV?.%"%I%l%9$N(B @samp{To:}, @samp{Cc:} $B%U%#!<%k%I$KAj<j$N%U%
 @vindex wl-draft-use-cache
 $B=i4|@_Dj$O(B @code{nil}$B!#Aw?.$9$k%a%C%;!<%8$r%-%c%C%7%e$9$k$+$I$&$+$r<($9%U(B
 $B%i%0$G$9!#(BNon-nil $B$J$i%-%c%C%7%e$7$^$9!#$?$@$7(B @code{wl-insert-message-id}$B$,(B
-non-nil$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#(B
+nil $B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#(B
 
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
diff --git a/doc/wl.texi b/doc/wl.texi
index 84f6ce3..db32ea5 100644
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -4274,7 +4274,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 f2042fa..f0a1b5e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2001-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-summary.el (wl-summary-buffer-next-message-function): New
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 2f562d6..b712509 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -640,7 +640,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))
@@ -2176,7 +2176,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 49e8850..b9c8cf4 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -41,7 +41,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)
 
-- 
1.7.10.4