Synch with No Gnus (200612270535).

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 6a42eb4..deeabdd 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -2797,6 +2797,7 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 
 @item auto-expire
 @cindex auto-expire
+@cindex expiring mail
 \e$B%0%k!<%W%Q%i%a!<%?!<$K\e(B @code{(auto-expire . t)} \e$B$N$h$&$JMWAG$,$"$l$P!"$9\e(B
 \e$B$Y$F$N4{FI5-;v$O4|8B@Z$l>C5n$5$l$k$h$&$K0u$rIU$1$i$l$^$9!#B>$NJ}K!$O!"\e(B
 @xref{Expiring Mail}.
@@ -2805,6 +2806,7 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 
 @item total-expire
 @cindex total-expire
+@cindex expiring mail
 \e$B%0%k!<%W%Q%i%a!<%?!<$K\e(B @code{(total-expire . t)} \e$B$N$h$&$JMWAG$,$"$l$P!"\e(B
 \e$B4{FI5-;v$O!"4|8B@Z$l>C5n$N0u$,IU$$$F$$$J$/$F$b$9$Y$F4|8B@Z$l>C5n=hM}$r;\\e(B
 \e$B$5$l$^$9!#Cm0U$7$F;HMQ$7$F2<$5$$!#L$FI5-;v!"0uIU$-5-;v!"J]N15-;v$O4|8B@Z\e(B
@@ -3420,6 +3422,7 @@ kill \e$B$5$l$?%0%k!<%W$r$9$Y$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#
 @item C-c C-x
 @kindex C-c C-x (\e$B%0%k!<%W\e(B)
 @findex gnus-group-expire-articles
+@cindex expiring mail
 \e$B8=:_$N%0%k!<%W$N4|8B@Z$l>C5n2DG=$J5-;v$KBP$7$F\e(B (\e$B$b$7$"$l$P\e(B) \e$B$9$Y$F4|8B@Z\e(B
 \e$B$l>C5n$N=hM}$r9T$J$$$^$9\e(B (@code{gnus-group-expire-articles})\e$B!#$3$l$O!"$=\e(B
 \e$B$N%0%k!<%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l>C5n2DG=$J$9$Y$F$N5-;v$r>C5n$9$k\e(B
@@ -3428,6 +3431,7 @@ kill \e$B$5$l$?%0%k!<%W$r$9$Y$FI=<($7$^$9\e(B (@code{gnus-group-list-killed})\e$B!#
 @item C-c C-M-x
 @kindex C-c C-M-x (\e$B%0%k!<%W\e(B)
 @findex gnus-group-expire-all-groups
+@cindex expiring mail
 \e$B$9$Y$F$N%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$KBP$7$F!"4|8B@Z$l>C5n$N\e(B
 \e$B=hM}$r9T$J$$$^$9!#\e(B(@code{gnus-group-expire-all-groups})\e$B!#\e(B
 @end table
@@ -3775,6 +3779,7 @@ Gnus
 @item C-c C-x
 @kindex C-c C-x (\e$B%H%T%C%/\e(B)
 @findex gnus-topic-expire-articles
+@cindex expiring mail
 (\e$B$b$7$"$l$P\e(B) \e$B8=:_$N%0%k!<%W$+%H%T%C%/$+$N$9$Y$F$N4|8B@Z$l>C5n2DG=5-;v$r\e(B
 \e$B4|8B@Z$l>C5n$7$^$9\e(B (@code{gnus-topic-expire-articles})\e$B!#\e(B(@pxref{Expiring
 Mail})\e$B!#\e(B
@@ -9953,6 +9958,7 @@ pick \e$B%b!<%I$G$N35N,9T$NMM<0$OI8=`$NMM<0$H$O>/$70c$$$^$9!#$=$l$>$l$N9T$N\e(B
 @item B e
 @kindex B e (\e$B35N,\e(B)
 @findex gnus-summary-expire-articles
+@cindex expiring mail
 \e$B8=:_$N%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$K$D$$$F!"4|8B@Z$l>C5n$N=h\e(B
 \e$BM}\e(B (@code{gnus-summary-expire-articles}) \e$B$r9T$J$$$^$9!#$3$l$O!"$=$N%0%k!<\e(B
 \e$B%W$K$7$P$i$/B8:_$7$F$$$?4|8B@Z$l>C5n2DG=$J$9$Y$F$N5-;v$r>C5n$9$k$H$$$&$3\e(B
@@ -9961,6 +9967,7 @@ pick \e$B%b!<%I$G$N35N,9T$NMM<0$OI8=`$NMM<0$H$O>/$70c$$$^$9!#$=$l$>$l$N9T$N\e(B
 @item B C-M-e
 @kindex B C-M-e (\e$B35N,\e(B)
 @findex gnus-summary-expire-articles-now
+@cindex expiring mail
 \e$B%0%k!<%W$N$9$Y$F$N4|8B@Z$l>C5n2DG=$J5-;v$r:o=|$7$^\e(B
 \e$B$9\e(B (@code{gnus-summay-expire-articles-now})\e$B!#$3$l$O!"8=:_$N%0%k!<%W$K$"\e(B
 \e$B$k\e(B @strong{\e$B$9$Y$F\e(B} \e$B$N4|8B@Z$l>C5n2DG=$J5-;v$,!"1J1s$K6u$NBg$-\e(B
@@ -14614,6 +14621,7 @@ nnml:mail.others:
 @node Expiring Mail
 @subsection \e$B%a!<%k$N4|8B@Z$l>C5n\e(B
 @cindex article expiry
+@cindex expiring mail
 
 \e$BEAE}E*$J%a!<%k%j!<%@!<$O!"4{FI$N0u$rIU$1$k$H%a!<%k$N5-;v$r2?$i$+$NJ}K!$G\e(B
 \e$B:o=|$9$k798~$,$"$j$^$9!#\e(BGnus \e$B$O%a!<%k$rFI$`$3$H$KBP$7$F!"4pK\E*$K0c$&J}\e(B
@@ -16548,6 +16556,7 @@ Gnus \e$B$K$OFs$D$N!V2D;k!W0u$,$"$j!"\e(B@acronym{IMAP} \e$B$K$O$O$?$C$?0l$D$@$H$$$
 @item nnimap-expunge-search-string
 @cindex expunging
 @vindex nnimap-expunge-search-string
+@cindex expiring @acronym{IMAP} mail
 \e$B$3$NJQ?t$K$O!"4|8B@Z$l>C5n$9$k$N$,K>$^$7$$5-;v$rC5$9$H$-$K%5!<%P!<$KAw$C\e(B
 \e$B$?\e(B @acronym{IMAP} \e$B$N8!:w%3%^%s%I$,F~$C$F$$$^$9!#%G%#%U%)%k%H\e(B
 \e$B$O\e(B @code{"UID %s NOT SINCE %s"} \e$B$G!"$3$3$G:G=i$N\e(B @code{%s} \e$B$O\e(B UID \e$B$N0lB7\e(B
@@ -16558,6 +16567,10 @@ Gnus \e$B$K$OFs$D$N!V2D;k!W0u$,$"$j!"\e(B@acronym{IMAP} \e$B$K$O$O$?$C$?0l$D$@$H$$$
 \e$B$;$^$9!#\e(B \e$B;H$&$3$H$,$G$-$kJ8;zNs$K4X$9$k$5$i$J$k>pJs$O!"\e(BRFC 2060 \e$B$N\e(B
 \e$BBh\e(B 6.4.4 \e$B>O$r8+$F2<$5$$!#\e(B
 
+\e$B$7$+$7$J$,$i\e(B @code{nnimap-search-uids-not-since-is-evil} \e$B$,??$K$J$C$F$$\e(B
+\e$B$k$H!"$3$NJQ?t$H$OL54X78$K%3%^%s%I\e(B
+\e$B$O\e(B @code{"UID NOT SINCE @var{date}"} \e$B$K$J$j$^$9!#\e(B
+
 @item nnimap-authinfo-file
 @vindex nnimap-authinfo-file
 \e$B%5!<%P!<$K%m%0%$%s$9$k$?$a$K;H$&G'>Z>pJs\e(B (credentials) \e$B$r4^$`%U%!%$%k$G\e(B
@@ -16580,6 +16593,48 @@ machine students.uio.no login larsi password geheimnis port imap
 \e$B%a!<%k%\%C%/%972$G?7Ce%a!<%k$rC5$9A0$K!"$=$l$i$rL$A*Br$K$7$^$9!#$$$/$D$+\e(B
 \e$B$N%5!<%P!<$,!"2?$i$+$N>u67$N85$G$3$l$rI,MW$H$9$k$h$&$G$9!#\e(BCourier
 1.7.1 \e$B$O$=$&$@$H$$$&Js9p$,$"$j$^$7$?!#\e(B
+
+@item nnimap-nov-is-evil
+@vindex nnimap-nov-is-evil
+@cindex Courier @acronym{IMAP} server
+@cindex @acronym{NOV}
+
+@acronym{NOV} \e$B%G!<%?%Y!<%9$r:n$i$J$$$+!"$^$?$O%m!<%+%k$N$b$N$r;H$$$^$9!#\e(B
+\e$B%G%#%U%)%k%H$O\e(B @code{gnus-agent} \e$B$NCM$G$9!#\e(B
+
+\e$BIaDL\e(B @acronym{NOV} \e$B%G!<%?%Y!<%9$r;H$&$H%X%C%@!<$N<hF@$,$H$F$bB.$/$J$j$^\e(B
+\e$B$9$,!"$"$k<o$N%5!<%P!<\e(B (\e$BFC$K$$$/$D$+$N\e(B Courier \e$B$NHG\e(B) \e$B$G$OHs>o$KCY\e(B
+\e$B$$\e(B @code{UID SEARCH UID} \e$B%3%^%s%I$r;H$$$^$9!#\e(BGnus \e$B%(!<%8%'%s%H$O!"$=$NCY\e(B
+\e$B$$%3%^%s%I$r;H$o$:$K\e(B @acronym{NOV} \e$B%G!<%?%Y!<%9$K>pJs$r%-%c%C%7%e$9$k$N\e(B
+\e$B$G!"$3$NJQ?t$N%G%#%U%)%k%HCM$O!"%(!<%8%'%s%H$,;H$o$l$k>l9g$O??$K!"$=$&$G\e(B
+\e$B$J$$>l9g$O56$K$J$j$^$9!#\e(B
+
+@item nnimap-search-uids-not-since-is-evil
+@vindex nnimap-search-uids-not-since-is-evil
+@cindex Courier @acronym{IMAP} server
+@cindex expiring @acronym{IMAP} mail
+
+@code{UID SEARCH UID @var{message numbers} NOT SINCE @var{date}} \e$B%3%^%s\e(B
+\e$B%I$r;H$o$J$$$h$&$K$7$^$9!#$=$l$O!"$"$k<o$N\e(B @acronym{IMAP} \e$B%5!<%P!<\e(B (\e$BFC$K\e(B
+\e$B$$$/$D$+$N\e(B Courier \e$B$NHG\e(B) \e$B$G$OHs>o$KCY$/$J$j$^$9!#Be$o$j\e(B
+\e$B$K\e(B @code{UID SEARCH SINCE @var{date}} \e$B$r;H$C$F!"\e(BGnus \e$B$G4|8B@Z$l>C5n$9$k\e(B
+\e$B5-;v$N%j%9%H$+$iM>J,$J$b$N$r<h$j=|$-$^$9!#\e(B
+
+Gnus \e$B$,%a!<%k$N4|8B@Z$l>C5n\e(B (@pxref{Expiring Mail}) \e$B$r9T$&$H$-$O!"4|8B@Z\e(B
+\e$B$l>C5n$7$F$b$h$$5-;v$N%j%9%H$,;O$a$K$"$j!"\e(BIMAP \e$B%5!<%P!<$K!V$3$l$i$N5-;v\e(B
+\e$B$N$&$A!"0l=54V$h$j8E$$$b$N$O$I$l\e(B?\e$B!W$N$h$&$JLd$$$rH/$7$^$9!#$3$l$O40A4$K\e(B
+\e$B9gM}E*$J<ALd$K8+$($^$9$,!"8+$?$H$3$m$$$/$D$+$N\e(B IMAP \e$B%5!<%P!<$O!"$9$Y$F$N\e(B
+\e$B8E$$5-;v$K$D$$$F4|8B@Z$l>C5n$NBP>]$+$I$&$+$rD4$Y$k$N$G!"$=$l$KEz$($k$?$a\e(B
+\e$B$KD9$$;~4V$,$+$+$j$^$9!#IT;W5D$J$3$H$K!V\e(B@emph{\e$B$9$Y$F\e(B} \e$B$N5-;v$N$&$A!"0l=5\e(B
+\e$B4V$h$j8E$$$b$N$O$I$l\e(B?\e$B!W$H$$$&<ALd$NJ}$,$a$C$]$&B.$/Ez$($,JV$C$F$/$k$N$G!"\e(B
+\e$B$3$NJQ?t$r@_Dj$7$F\e(B Gnus \e$B$K$3$N<ALd$r=P$5$;$k$3$H$K$h$C$F!"K\Mh$N<ALd$=$N\e(B
+\e$B$b$N$X$NEz$rF@$k$3$H$,$G$-$k$N$G$9!#\e(B
+
+\e$B$3$NLdBj$O<B:]$K$"$J$?$KG&$S4s$C$F$/$k$G$7$g$&!#:G=i$N$3$m$O!"\e(BGnus \e$B$r@_\e(B
+\e$BDj$7$F!"$9$Y$F$,$&$^$/$$$C$?$H$7$F$b!"$$$C$?$sFs!A;0@iDL$N%a%C%;!<%8$,N/\e(B
+\e$B$^$C$?$J$i$P!"$"$J$?$O\e(B Gnus \e$B$NCY$$$3$H$r$N$N$7$j$O$8$a$k$G$7$g$&!#0lJ}!"\e(B
+\e$B$"$J$?$,BgNL$NEE;R%a!<%k$r$?$C$?0l=54V$G<u$1<h$k$N$G$"$l$P!"$3$NJQ?t$r@_\e(B
+\e$BDj$9$k$H\e(B Gnus \e$B$H\e(B IMAP \e$B%5!<%P!<4V$NDL?.NL$NA}Bg$r>7$/$G$7$g$&!#\e(B
 @end table
 
 @menu
@@ -16755,7 +16810,7 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-split-fancy}.
 
 @node Expiring in IMAP
 @subsection IMAP \e$B$G$N4|8B@Z$l>C5n\e(B
-@cindex expiring imap mail
+@cindex expiring @acronym{IMAP} mail
 
 @code{nnimap} \e$B$O40A4$J\e(B @code{nnmail} \e$BM3Mh$N%P%C%/%(%s%I$G$O$"$j$^$;$s$,!"\e(B
 \e$BI8=`E*$J$?$$$F$$$N4|8B@Z$l>C5n\e(B (@pxref{Expiring Mail}) \e$B$N5!G=$r%5%]!<%H\e(B
@@ -16774,6 +16829,10 @@ Nnmail \e$B$GBP1~$9$k$b$N\e(B: @code{nnmail-split-fancy}.
 \e$B%5!<%P!<$,%5%]!<%H$7$J$1$l$P$J$i$J$$$3$H$b0UL#$7$^$9!#$?$$$F$$$O%5%]!<%H\e(B
 \e$B$7$^$9!#9,$$$K$b!#\e(B
 
+\e$B$b$7\e(B @acronym{IMAP} \e$B%a!<%k$N4|8B@Z$l>C5n$,$H$F$bCY$/46$8$i$l$k$N$J$i$P!"\e(B
+\e$B%5!<%P!<JQ?t\e(B @code{nnimap-search-uids-not-since-is-evil} \e$B$r@_Dj$9$k$3$H\e(B
+\e$B$r;n$7$F$_$F$/$@$5$$!#\e(B
+
 @table @code
 @item nnmail-expiry-wait
 @item nnmail-expiry-wait-function
@@ -19008,7 +19067,7 @@ Variables}) \e$B$r@_Dj$9$k$3$H$,$G$-$^$9!#\e(BGnus \e$B$O$[$H$s$I3N$+$K$b$C$HCY$/$J
 @findex gnus-agent-expire-group
 @cindex agent expiry
 @cindex Gnus agent expiry
-@cindex expiry
+@cindex expiry, in Gnus agent
 
 \e$B%(!<%8%'%s%H%P%C%/%(%s%I\e(B @code{nnagent} \e$B$O4|8B@Z$l>C5n$r07$$$^$;$s!#$(!<\e(B
 \e$B$H!">/$J$/$H$bB>$N%P%C%/%(%s%I$N$h$&$K$=$l$r07$$$^$;$s!#$=$NBe$o$j$K!"\e(B
@@ -23531,9 +23590,6 @@ From Ted Zlatanov <tzz@@lifelogs.com>.
 (gnus-registry-initialize)
 (spam-initialize)
 
-;; @r{\e$B;d$O\e(B spam \e$B0u$rIU$1$k$N$K\e(B @kbd{C-s} \e$B$r9%$`!#\e(B}
-(define-key gnus-summary-mode-map "\C-s" 'gnus-summary-mark-as-spam)
-
 (setq
  spam-log-to-registry t ;; @r{Spam \e$B$N<+F08!=P$N$?$a!#\e(B}
  spam-use-BBDB t