Synch with No Gnus (201104141021).

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 348dffe..aaa2b5f 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -21745,10 +21745,10 @@ b d} \e$B$r;H$C$F!"$=$N\e(B @code{nnmairix} \e$B%0%k!<%W$r:n$jD>$7$F$/$@$5$$!#\e(B
 \e$B$K\e(B mairix \e$BMQ$K;H$&>l9g$G$b!"$=$l$rL@<(E*$K@_Dj$9$kI,MW$O$"$j$^$;$s!#\e(B)
 
 @item
-\e$B$b$7\e(B Gnus \e$B%l%8%9%H%j!<$r;H$C$F$$$k$J$i\e(B:
-@code{nnmairix} \e$B%0%k!<%W$G%l%8%9%H%j!<$r;H$&\e(B (\e$B$=$l$i$N%0%k!<%W\e(B
-\e$B$r\e(B @code{gnus-registry-unfollowed-groups} \e$B$K4^$a$k\e(B) \e$B$3$H$O$7$J$$$G$/$@$5\e(B
-\e$B$$!#$b$7\e(B @code{gnus-registry-split-fancy-with-parent} \e$B$r;H$C$F$$$k$J\e(B
+\e$B$b$7\e(B Gnus \e$B%l%8%9%H%j!<$r;H$C$F$$$k$J$i!"\e(B@code{nnmairix} \e$B%0%k!<%W$G%l%8%9\e(B
+\e$B%H%j!<$r;H$o$J$$$/$@$5$$\e(B (\e$B%G%#%U%)%k%H\e(B
+\e$B$G\e(B @code{gnus-registry-unfollowed-groups} \e$B$K4^$^$l$F$$$^$9\e(B)\e$B!#$b\e(B
+\e$B$7\e(B @code{gnus-registry-split-fancy-with-parent} \e$B$r;H$C$F$$$k$J\e(B
 \e$B$i\e(B @emph{\e$BFCJL$JCm0U\e(B} \e$B$,I,MW$G$9!#J,3d$5$l$F\e(B @code{nnmairix} \e$B%0%k!<%W$KF~$C\e(B
 \e$B$?%a!<%k$O!"DL>o$=$N%0%k!<%W$N?7Ce%a!<%k$r%A%'%C%/$7$?$H$?$s$K1J5W$KL5$/\e(B
 \e$B$J$C$F$7$^$$$^$9\e(B (\e$B$O$$!";d$O$=$l$r$d$C$F$7$^$$$^$7$?\e(B@dots{})\e$B!#\e(B
@@ -25506,8 +25506,7 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
 \e$BNI$/$7$?$3$H$K\e(B Gnus \e$B%l%8%9%H%j!<$N@_Dj$O$H$F$b4JC1$G$9\e(B:
 
 @lisp
-(setq gnus-registry-max-entries 2500
-      gnus-registry-use-long-group-names t)
+(setq gnus-registry-max-entries 2500)
 
 (gnus-registry-initialize)
 @end lisp
@@ -25530,16 +25529,15 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
                                 ("spam" t)
                                 ("train" t))
  gnus-registry-max-entries 500000
- gnus-registry-use-long-group-names t
+ ;; \e$B$3$l$,%G%#%U%)%k%H\e(B
  gnus-registry-track-extra '(sender subject))
 @end lisp
 
-\e$B$3$l$i$,0UL#$9$k$N$O!"$"$A$3$A$K$"$k$?$/$5$s$N5-;v$rJ];}$7!"D9$$%0%k!<%W\e(B
-\e$BL>$r;H$$!"Aw?.<T$HI=Bj$G\e(B (\e$BC1$J$k?F$N\e(B Message-ID \e$B$G$G$O$J$/\e(B) \e$B5-;v$rDI@W$7!"\e(B
-\e$BF~$C$F$-$?5-;v$r%l%8%9%H%j!<$,J,3d$9$k$H$-$K5-;v$N9T$-@h$H$7$F0l$D0J>e$N\e(B
-\e$B8uJd$,$"$C$?$iB??t7h$G7h$a$k!"$H$$$&$3$H$G$9!#2C$($F\e(B ``nntp''\e$B!"\e(B``nnrss''\e$B!"\e(B
-``spam'' \e$B$^$?$O\e(B ``train'' \e$B$K9gCW$9$k%0%k!<%W$N5-;v$r%l%8%9%H%j!<$KL5;k$5\e(B
-\e$B$;$^$9!#\e(B
+\e$B$3$l$i$,0UL#$9$k$N$O!"$"$A$3$A$K$"$k$?$/$5$s$N5-;v$rJ];}$7!"Aw?.<T$HI=Bj\e(B
+\e$B$G\e(B (\e$BC1$J$k?F$N\e(B Message-ID \e$B$G$G$O$J$/\e(B) \e$B5-;v$rDI@W$7!"F~$C$F$-$?5-;v$r%l%8\e(B
+\e$B%9%H%j!<$,J,3d$9$k$H$-$K5-;v$N9T$-@h$H$7$F0l$D0J>e$N8uJd$,$"$C$?$iB??t7h\e(B
+\e$B$G7h$a$k!"$H$$$&$3$H$G$9!#2C$($F\e(B ``nntp''\e$B!"\e(B``nnrss''\e$B!"\e(B``spam'' \e$B$^$?\e(B
+\e$B$O\e(B ``train'' \e$B$K9gCW$9$k%0%k!<%W$N5-;v$r%l%8%9%H%j!<$KL5;k$5$;$^$9!#\e(B
 
 \e$B$"$J$?$,$3$N$9$Y$F$K46LC$r<u$1$k$3$H$O5?$$$"$j$^$;$s$,!"$3$&MW5a$7$b$9$k\e(B
 \e$B$G$7$g$&!#!V;d$O\e(B Gnus \e$B%f!<%6!<$G%+%9%?%^%$%:$9$k$3$H$,@8$-$,$$$G$9!#$b$C\e(B
@@ -25547,19 +25545,10 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
 
 @defvar gnus-registry-unfollowed-groups
 @code{gnus-registry-split-fancy-with-parent} \e$B$,DI@W$7$J$$%0%k!<%W$G$9!#\e(B
-\e$B$=$l$i$O!"$G$b%l%8%9%H%j!<$K5-O?$5$l$^$9!#$3$l$O@55,I=8=$N%j%9%H$G$9!#\e(B
-@end defvar
-
-@defvar gnus-registry-ignored-groups
-\e$B%l%8%9%H%j!<$K5-O?$5$l$J$$%0%k!<%W$G$9!#$3$l$O@55,I=8=$N%j%9%H$G!"%0%k!<\e(B
-\e$B%W\e(B/\e$B%H%T%C%/$N%+%9%?%^%$%:$G@_Dj$9$k$3$H$b$G$-$^$9\e(B (\e$B$J$N$G!"FCDj$N%0%k!<\e(B
-\e$B%W$^$?$O%H%T%C%/A4BN$r!"L5;k$5$;$?$j0];}$5$;$k$3$H$,$G$-$^$9\e(B)\e$B!#\e(B
-@end defvar
-
-@defvar gnus-registry-use-long-group-names
-\e$B%l%8%9%H%j!<$,D9$$%0%k!<%WL>$r;H$&$+$I$&$+$r;XDj$7$^$9!#\e(B@code{t} \e$B$K@_Dj\e(B
-\e$B$9$k$3$H$r?J$a$^$9$,!"$=$&$7$J$/$F$b$9$Y$FF/$-$^$9!#>-Mh$N5!G=$GI,MW$K$J\e(B
-\e$B$k$G$7$g$&!#\e(B
+\e$B$=$l$i$O!"$G$b%l%8%9%H%j!<$K5-O?$5$l$^$9!#$3$l$O@55,I=8=$N%j%9%H$G$9!#%G%#\e(B
+\e$B%U%)%k%H$G$O!"L>A0$,\e(B ``delayed''\e$B!"\e(B``drafts''\e$B!"\e(B``queue'' \e$B$^$?\e(B
+\e$B$O\e(B ``INBOX'' \e$B$G=*$o$C$F$$$k!"\e(B@code{nnmairix} \e$B%P%C%/%(%s%I$KB0$7$F$$$k!"\e(B
+\e$B$"$k$$$O\e(B ``archive'' \e$B$H$$$&8l$r4^$s$G$$$k$I$s$J%0%k!<%W$bDI@W$7$^$;$s!#\e(B
 @end defvar
 
 @defvar gnus-registry-max-entries
@@ -25567,8 +25556,15 @@ nnml\e$B!"\e(Bnnmaildir \e$B$J$I$N$I$N%P%C%/%(%s%I$K$"$C$F$b!"$=$N%U%i%0$ON)$AB3$1$
 \e$B$k\e(B @code{nil}) \e$B$G$9!#\e(B
 @end defvar
 
+@defvar gnus-registry-max-pruned-entries
+\e$B=|5n$7$?8e$G%l%8%9%H%j!<$,J];}$9$k:GBg$N%(%s%H%j!<$N?t\e(B (\e$B@0?t$^$?$OL5@)8B\e(B
+\e$B$r0UL#$9$k\e(B @code{nil}) \e$B$G$9!#\e(B
+@end defvar
+
 @defvar gnus-registry-cache-file
-Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
+Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#%G%#%U%)%k%H$G\e(B
+\e$B%U%!%$%kL>$O\e(B @file{.newsrc.eld} \e$B$HF1$8%G%#%l%/%H%j!<$KCV$+$l\e(B
+\e$B$k\e(B @file{.gnus.registry.eioio} \e$B$G$9!#\e(B
 @end defvar
 
 @node Registry Article Refer Method
@@ -25590,8 +25586,7 @@ Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
 ;; \e$B%l%8%9%H%j!<$r;H$C$F5-;v$r;2>H$9$k>l9g$KNI9%$J%R%C%HN($rF@$k$?$a\e(B
 ;; \e$B$K$O!"==J,$J%(%s%H%j!<$r0];}$9$k$h$&$K$7$F$/$@$5$$!#5-;v$,$I$3$K\e(B
 ;; \e$B$"$k$+$r\e(B Gnus \e$B$KCN$i$;$k$?$a$K!"D9$$%0%k!<%WL>$r;HMQ$7$F$/$@$5$$!#\e(B
-(setq gnus-registry-max-entries 2500
-      gnus-registry-use-long-group-names t)
+(setq gnus-registry-max-entries 2500)
 
 (gnus-registry-initialize)
 
@@ -25636,10 +25631,9 @@ Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
 
 @defvar gnus-registry-track-extra
 \e$B$3$l$O%7%s%\%k$N%j%9%H$G$9!#%+%9%?%^%$%:$N%$%s%?!<%U%'!<%9$+$iJQ99$9$k$N\e(B
-\e$B$K$O!"$=$l$,%Y%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9$,!"?F$GJ,3d$9$k$K\e(B
-\e$B$O\e(B @code{subject} \e$B$H\e(B @code{sender} \e$B$bDI@W$9$kI,MW$,$"$k$G$7$g$&!#$=$l$O\e(B
-\e$BF/$/$+$b$7$l$^$;$s!#%a!<%k$NN.DLNL$,Bg$-$/$F?M!9$,F1$8%0%k!<%W$K$H$I$^$C\e(B
-\e$B$F$$$J$$$H!"HQ$o$7$/$J$k>l9g$,$"$j$^$9!#\e(B
+\e$B$K$O!"$=$l$,%Y%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{(subject sender)} \e$B$G!"$=$l\e(B
+\e$B$G$*$=$i$/F0:n$9$k$G$7$g$&!#%a!<%k$NN.DLNL$,Bg$-$/$F?M!9$,F1$8%0%k!<%W$K\e(B
+\e$B$H$I$^$C$F$$$J$$$H!"HQ$o$7$/$J$k>l9g$,$"$j$^$9!#\e(B
 @end defvar
 
 @defvar gnus-registry-split-strategy
@@ -25647,6 +25641,7 @@ Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
 \e$B$l$,%Y%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9$,!"9gCW$NB??t7h$^$?$O:G=i\e(B
 \e$B$K8+$D$+$C$?$b$N$K4p$E$$$FAw?.<T\e(B (sender) \e$B$^$?$OI=Bj\e(B (subject) \e$B$GJ,3d$9\e(B
 \e$B$k$K$O\e(B @code{majority} \e$B$^$?$O\e(B @code{first} \e$B$K@_Dj$9$kI,MW$,$"$k$G$7$g$&!#\e(B
+\e$B;d$O\e(B @code{majority} \e$B$,:G$bNI$$$3$H$r8+$D$1$^$7$?!#\e(B
 @end defvar
 
 @node Store custom flags and keywords
@@ -25683,17 +25678,14 @@ Gnus \e$B$NA`:n$rDL$8$F%l%8%9%H%j!<$,5-O?$5$l$k%U%!%$%k$G$9!#\e(B
 \e$B$&4JC1$J%$%s%?!<%U%'!<%9$,$"$j$^$9\e(B (\e$B%G!<%?$OJ]B8$9$k$?$a$K$G$-$k8B$j0l$D\e(B
 \e$B$N%j%9%H$KJQ49$5$l$^$9\e(B)\e$B!#\e(B
 
-@defun gnus-registry-store-extra-entry (id key value)
-\e$B5-;v\e(B @code{id} \e$B$N$?$a$NFCJL$J%G!<%?!&%-!<\e(B @code{key} \e$B$K\e(B @code{value} \e$B$r\e(B
-\e$B5-O?$7$^$9!#\e(B
-@end defun
-
-@defun gnus-registry-delete-extra-entry (id key)
-\e$B5-;v\e(B @code{id} \e$B$N$?$a$NFCJL$J%G!<%?!&%-!<\e(B @code{key} \e$B$r>C5n$7$^$9!#\e(B
+@defun gnus-registry-set-id-key (id key value)
+@code{id} \e$B$r;}$D%a%C%;!<%8$N$?$a$K\e(B @code{key} \e$B$K$D$$$F\e(B @code{value} \e$B$r3J\e(B
+\e$BG<$7$^$9!#\e(B
 @end defun
 
-@defun gnus-registry-fetch-extra (id key)
-\e$B5-;v\e(B @code{id} \e$B$N$?$a$NFCJL$J%G!<%?!&%-!<\e(B @code{key} \e$B$r<h$j9~$_$^$9!#\e(B
+@defun gnus-registry-get-id-key (id key)
+@code{id} \e$B$r;}$D%a%C%;!<%8$N$?$a$K\e(B @code{key} \e$B$K$D$$$F$N%G!<%?$r<hF@$7$^\e(B
+\e$B$9!#\e(B
 @end defun
 
 @defvar gnus-registry-extra-entries-precious