From: teranisi <teranisi>
Date: Fri, 15 Jun 2001 04:11:24 +0000 (+0000)
Subject: * doc/wl-ja.texi, doc/wl.texi: Applied patch from
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a61cd9411b1f0c19715ff0e60cafbf7d561dc3a6;p=elisp%2Fwanderlust.git

* doc/wl-ja.texi, doc/wl.texi: Applied patch from
Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>.

* wl-vars.el (wl-folder-process-duplicates-alist): Changed default
value to nil (According to the patch from
Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>).

* wl-util.el (wl-biff-check-folder): Call elmo-folder-check instead
of elmo-folder-close.
---

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 22c4ad8..9d57b6d 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -3625,6 +3625,29 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8
 @vindex elmo-pop3-use-cache
 $B=i4|@_Dj$O(B @code{t}$B!#(BNon-nil $B$J$i!"(BPOP3 $B$GFI$s$@%a%C%;!<%8$r%-%c%C%7%e$7(B
 $B$^$9!#(B
+
+@item wl-folder-process-duplicates-alist
+@vindex wl-folder-process-duplicates-alist
+$B=i4|@_Dj$O(B @code{nil}$B!#=EJ#$7$?%a%C%;!<%8$,F1$8%U%)%k%@$K$"$k>l9g$NF0:n(B
+$B$r;XDj$7$^$9!#3F9`L\$O!"%U%)%k%@L>$N@55,I=8=$HF0:n$+$i$J$j$^$9!#(B
+$BF0:n$H$7$F$O0J2<$N$b$N$,;XDj$G$-$^$9!#(B
+
+@example
+@code{nil} : $B=EJ#%a%C%;!<%8$KBP$7!$2?$b$7$J$$!%(B
+@code{hide} : $B=EJ#%a%C%;!<%8$r%5%^%j$KI=<($7$J$$!%(B
+@code{read} : $B=EJ#%a%C%;!<%8$r4{FI$K$9$k!%(B
+@end example
+
+@noindent
+$BNc$($P0J2<$N$h$&$K@_Dj$7$^$9(B ($B%^%k%A%U%)%k%@$G=EJ#%a%C%;!<%8$r1#$9>l9g(B)
+
+@lisp
+@group
+(setq wl-folder-process-duplicates-alist
+                 '(("^\\+draft$" . nil) ("^\\+trash$" . nil)
+                   ("^\\*.*" . hide) (".*" . read)))
+@end group
+@end lisp
 @end table
 
 
diff --git a/doc/wl.texi b/doc/wl.texi
index c6f233f..21bc00e 100644
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -3632,6 +3632,30 @@ cached.
 @vindex elmo-pop3-use-cache
 The initial setting is @code{t}.  If non-nil, messages read via POP3 are
 cached.
+
+@item wl-folder-process-duplicates-alist
+@vindex wl-folder-process-duplicates-alist
+The initial setting is @code{nil}.
+This list determines how to deal with duplicated messages in the same folder.
+Each item in the list is regexp of folder name and action; you can specify any
+one of the following in the place of action:
+
+@example
+@code{nil} : do nothing for duplicated messages.
+@code{hide} : hide duplicated messages from the summary.
+@code{read} : set duplicated messages as read.
+@end example
+
+@noindent
+Following is an example (hide duplicated messages in multi folders)
+
+@lisp
+@group
+(setq wl-folder-process-duplicates-alist
+                 '(("^\\+draft$" . nil) ("^\\+trash$" . nil)
+                   ("^\\*.*" . hide) (".*" . read)))
+@end group
+@end lisp
 @end table
 
 
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0f64a1e..57f2974 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-vars.el (wl-folder-process-duplicates-alist): Changed default
+	value to nil (According to the patch from
+	Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>).
+
+	* wl-util.el (wl-biff-check-folder): Call elmo-folder-check instead
+	of elmo-folder-close.
+
 2001-06-06  Peter Møller Neergaard <turtle@bu.edu>
 
 	* wl-summary.el (wl-summary-resend-bounced-mail): Modified regexp
diff --git a/wl/wl-util.el b/wl/wl-util.el
index ff5b3f1..f8c94a2 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -829,7 +829,7 @@ This function is imported from Emacs 20.7."
   (if (eq (elmo-folder-type folder) 'pop3)
       ;; pop3 biff should share the session.
       (prog2
-	  (elmo-folder-close folder) ; Close session.
+	  (elmo-folder-check folder)
 	  (wl-folder-check-one-entity (elmo-folder-name-internal folder))
 	(elmo-folder-close folder))
     (let ((elmo-network-session-name-prefix "BIFF-"))
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 1c14231..64bf9a4 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1645,10 +1645,7 @@ If nil, always use default."
   :type 'boolean
   :group 'wl-pref)
 
-(defcustom wl-folder-process-duplicates-alist
-  (list (cons (concat "^" (regexp-quote wl-draft-folder) "$\\|^"
-		      (regexp-quote wl-trash-folder) "$") nil)
-	(cons ".*" 'hide))
+(defcustom wl-folder-process-duplicates-alist nil
   "Specify process type of duplicated messages.
 It should be a list of cons cell like: (REGEXP . TYPE)
 REGEXP is a regular expression string of folder name.