Merge from trunk

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 366cceb..10410b0 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -3280,10 +3280,13 @@ first, last    ...\e$B%U%#%k%?%U%)%k%@$K0\F0\e(B
 @item T
 @kindex T (Summary)
 @findex wl-summary-toggle-thread
-\e$B%9%l%C%II=<($r%H%0%k$7$^$9!#\e(B
-\e$B8=:_$N%9%l%C%II=<(>uBV$O%b!<%I%i%$%s$KI=<($5$l$^$9!%\e(B
-@samp{@{S@}} \e$B$O%9%l%C%I!&%*%U\e(B(Sequence)\e$B$N>uBV!$\e(B
-@samp{@{T@}} \e$B$O%9%l%C%I!&%*%s\e(B(Thread)\e$B$N>uBV$r<($7$^$9!%\e(B
+\e$B%9%l%C%II=<($r%H%0%k$7$^$9!#$=$N>uBV$O\e(B Wanderlust \e$B$r=*N;$7$F$bJ]B8$5$l\e(B
+\e$B$^$9!#?75,$K:n@.$5$l$?%5%^%j$KBP$7$F$N%G%U%)%k%H$N>uBV$O\e(B
+@code{wl-summary-default-view} \e$B$d\e(B @code{wl-summary-default-view-alist}
+\e$B$G;XDj$9$k$3$H$,$G$-$^$9!#\e(B
+\e$B8=:_$N%9%l%C%II=<(>uBV$O%b!<%I%i%$%s$KI=<($5$l$^$9!#\e(B
+@samp{@{S@}} \e$B$O%9%l%C%I!&%*%U\e(B(Sequence)\e$B$N>uBV!"\e(B
+@samp{@{T@}} \e$B$O%9%l%C%I!&%*%s\e(B(Thread)\e$B$N>uBV$r<($7$^$9!#\e(B
 (@code{wl-summary-toggle-thread})
 
 @item l
@@ -3745,7 +3748,7 @@ nil\e$B!'\e(B \e$B%U%)%k%@%b!<%I$KLa$k$+?R$M$k\e(B
 
 @item wl-summary-weekday-name-lang
 @vindex  wl-summary-weekday-name-lang
-\e$B=i4|@_Dj$O\e(B @samp{ja}\e$B!#%5%^%j$NMKF|I=<($N8@8l$r;XDj$7$^$9!#\e(B@samp{en} \e$B$J$i\e(B
+\e$B%5%^%j$NMKF|I=<($N8@8l$r;XDj$7$^$9!#\e(B@samp{en} \e$B$J$i\e(B
 \e$B1Q8l!"\e(B@samp{fr} \e$B$J$i%U%i%s%98l!"\e(B@samp{de} \e$B$J$i%I%$%D8l$H$J$j$^$9!#\e(B
 \e$BCM$rJQ99$7$?8e$K$O!"%5%^%j$r\e(B rescan \e$B$7$F2<$5$$!#\e(B
 
@@ -3771,16 +3774,38 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B '(1 . 4)\e$B!#\e(B
 \e$B%5%^%j$rI=<($9$k%&%#%s%I%&$H%a%C%;!<%8K\BN$rI=<($9$k%&%#%s%I%&$NHf$r\e(B cons \e$B$G;XDj$7$^$9!#\e(Bcar:cdr \e$B$,\e(B \e$B%5%^%j\e(B:\e$B%a%C%;!<%8\e(B \e$B$G$9!#\e(B
 
+@item wl-summary-from-function
+@vindex wl-summary-from-function
+\e$B%5%^%j$N:9=P?MI=<($N@07A$K;H$&4X?t$r;XDj$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{wl-summary-default-from} \e$B$G$9!#\e(B
+
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 \e$B=i4|@_Dj$O\e(B @samp{nobody@@nowhere?}\e$B!#\e(B
 \e$B%a%C%;!<%8$K\e(B @samp{From:} \e$B$,L5$+$C$?>l9g$K%5%^%j$KI=<($9$kJ8;zNs$G$9!#\e(B
 
+@item wl-summary-subject-function
+@vindex wl-summary-subject-function
+\e$B%5%^%j$N%5%V%8%'%/%HI=<($N@07A$K;H$&4X?t$r;XDj$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{wl-summary-default-subject} \e$B$G!"%5%V%8%'%/%H@hF,$N\e(B
+\e$B%j%9%HL>$J$IItJ,$r%+%C%H$7$^$9!#\e(B
+\e$B%5%V%8%'%/%H$r$=$N$^$^I=<($9$k$K$O0J2<$N$h$&$K@_Dj$7$^$9!#\e(B
+
+@lisp
+(setq wl-summary-subject-function 'identity)
+@end lisp
+
 @item wl-summary-no-subject-message
 @vindex  wl-summary-no-subject-message
 \e$B=i4|@_Dj$O\e(B @samp{(WL:No Subject in original.)}\e$B!#%a%C%;!<%8$K\e(B 
 @samp{Subject:} \e$B$,L5$+$C$?>l9g$K%5%^%j$KI=<($9$kJ8;zNs$G$9!#\e(B
 
+@item wl-summary-default-view
+@vindex wl-summary-default-view
+\e$B=i4|@_Dj$O\e(B @code{'thread}\e$B!#\e(B
+\e$B?75,$K:n@.$5$l$?%5%^%j$N>uBV$r%9%l%C%II=<($J$i\e(B @code{'thread}\e$B!"\e(B
+\e$BHV9f=g$J$i\e(B @code{'sequence} \e$B$N$$$:$l$+$G;XDj$7$^$9!#\e(B
+
 @item wl-summary-use-frame
 @vindex wl-summary-use-frame
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -6288,7 +6313,7 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 (@samp{CONDITION} @samp{ACTION} [@code{continue}])
 @end lisp
 
-\e$B$H$$$&0lAH$G!"\e(B@samp{CONDITION} \e$B$,??$N>l9g$K\e(B @samp{ACTION} \e$B$r<B9T$7$^$9!#\e(B
+\e$B$NAH$G!"\e(B@samp{CONDITION} \e$B$,??$N>l9g$K\e(B @samp{ACTION} \e$B$r<B9T$7$^$9!#\e(B
 \e$BBh0l$NMWAG\e(B @samp{CONDITION} \e$B$K$O>r7o$r\e(B S \e$B<0$G5-=R$7$^$9!#=q<0$K$D$$$F$O\e(B
 \e$B$9$08e$G@bL@$7$^$9!#BhFs$NMWAG\e(B @samp{ACTION} \e$B$K$O%a%C%;!<%8$N?6$jJ,$1@h\e(B
 \e$B$N%U%)%k%@L>!"$b$7$/$O%7%s%\%k$r;XDj$7$^$9!#\e(B
@@ -6323,7 +6348,7 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @end table
 
 @item
-\e$B2?$i$+$N?t\e(B @samp{SIZE} \e$B$r0z?t$H$7$F$H$k4X?t!#\e(B
+1 \e$B$D$N@0?t\e(B (@samp{SIZE}) \e$B$r0z?t$H$7$F$H$k4X?t!#\e(B
 
 @table @code
 @item @code{<}
@@ -6333,7 +6358,7 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @end table
 
 @item
-\e$BG$0U$N?t$N0z?t$r<h$k4X?t!#\e(B
+\e$BG$0U?t$N0z?t$r<h$k4X?t!#\e(B
 
 @table @code
 @item @code{or}

diff --git a/doc/wl.texi b/doc/wl.texi
index 2db6823..efeb3bb 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -3296,7 +3296,9 @@ You can sort by @samp{date}, @samp{from}, @samp{number} and @samp{subject}.
 @item T
 @kindex T (Summary)
 @findex wl-summary-toggle-thread
-Toggle the threading.
+Toggle the threading. The state will be preserved after exiting
+Wanderlust. You can alter default state for newly created summary
+by @code{wl-summary-default-view} or @code{wl-summary-default-view-alist}.
 Threading status is displayed on the modeline.
 @samp{@{S@}} means threading is off (Sequence) and
 @samp{@{T@}} means threading is on (Thread).
@@ -3764,7 +3766,7 @@ folder is moved.
 
 @item wl-summary-weekday-name-lang
 @vindex  wl-summary-weekday-name-lang
-The initial setting is @samp{ja}.  Specify language of the weekday.
+Specify language of the weekday.
 @samp{en} displays English, @samp{fr} displays French, @samp{de}
 displays Deutsch. You should rescan summary view after changing this value.
 
@@ -3791,16 +3793,38 @@ The initial setting is '(1 . 4).
 A cons cell to specify the rate of summary and message window.
 car:cdr corresponds summary:message.
 
+@item wl-summary-from-function
+@vindex wl-summary-from-function
+Format function to display sender in summary.
+The initial setting is @code{wl-summary-default-from}.
+
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 The initial setting is @samp{nobody@@nowhere?}.  A string which is
 displayed when there's no @samp{From:} field in the message.
 
+@item wl-summary-subject-function
+@vindex wl-summary-subject-function
+Format function to display subject in summary.
+The initial setting is @code{wl-summary-default-subject} and
+it will cut the list name part etc. on the top of the subject.
+To display subject as it is, set as follows.
+
+@lisp
+(setq wl-summary-subject-function 'identity)
+@end lisp
+
 @item wl-summary-no-subject-message
 @vindex  wl-summary-no-subject-message
 The initial setting is @samp{(WL:No Subject in original.)}.  A string
 which is displayed when there's no @samp{Subject:} field in the message.
 
+@item wl-summary-default-view
+@vindex wl-summary-default-view
+The initial setting is @code{'thread}.
+The default state for newly created summary. You can set either
+@code{'thread} for thread view or @code{'sequence} for sequential view.
+
 @item wl-summary-use-frame
 @vindex wl-summary-use-frame
 The initial setting is @code{nil}.
@@ -6412,7 +6436,7 @@ from matching @code{\(\)} patterns in the previous @samp{VALUE}.
 @end table
 
 @item
-Functions which accept an argument @samp{SIZE}, @samp{SIZE} is some number.
+Functions which accept an integer argument (@samp{SIZE}).
 
 @table @code
 @item @code{<}