Synch to No Gnus 200512190739.

diff --git a/emacs-mime-ja.texi b/emacs-mime-ja.texi
index 53b228d..4f282ec 100644 (file)
--- a/emacs-mime-ja.texi
+++ b/emacs-mime-ja.texi
@@ -371,13 +371,30 @@ LaTeX \e$B$NJ88%!#\e(B@code{mm-uu-tex-groups-regexp} \e$B$K9gCW$9$kL>A0$N%0%k!<%W$G
       (remove "text/html" mm-automatic-display))
 @end lisp
 
-\e$B$5$i$K!"$3$l$K\e(B @code{"image/.*"} \e$B$rDI2C$9$k$3$H$,Lr$KN)$D$+$b$7$l$^$;$s!#\e(B
-Spammers \e$B$,\e(B @samp{multipart/alternative} \e$B%a%C%;!<%8$NM%@h$5$l$kB&$G!"$=\e(B
-\e$B$l$r;H$C$F$$$k$3$H$,$"$j$^$9!#\e(B@code{gnus-buttonized-mime-types} \e$B$b;2>H$7\e(B
-\e$B$F2<$5$$\e(B (@pxref{MIME Commands, ,MIME \e$B%3%^%s%I\e(B, gnus-ja, The Gnus
-Manual})\e$B!#$=$l$K\e(B @code{"multipart/alternative"} \e$B$r2C$($k$H!"$=$&$$$&%a!<\e(B
-\e$B%k$K4^$^$l$F$$$kFs$D$N%a%G%#%"!&%?%$%W$N$&$A$N0l$D$r<j$GA*$V$3$H$,$G$-$k\e(B
-\e$B$h$&$K$J$j$^$9!#\e(B
+\e$B$5$i$K!"$3$l$K\e(B @code{"image/.*"} \e$B$rDI2C$9$k$3$H$OLr$KN)$D$G$7$g$&!#\e(B
+Spammers \e$B$,\e(B @samp{multipart/alternative} \e$B%a%C%;!<%8$NM%@h$5$l$kB&$G$=$l\e(B
+\e$B$r;H$C$F$$$k$3$H$,$"$j!"$"$J$?$O$=$l0J30$N%Q!<%H$,$"$k$3$H$K5$$,IU$+$J$$\e(B
+\e$B$+$b$7$l$^$;$s!#\e(B@code{gnus-buttonized-mime-types} \e$B$b;2>H$7$F2<$5\e(B
+\e$B$$\e(B (@pxref{MIME Commands, ,MIME \e$B%3%^%s%I\e(B, gnus-ja, The Gnus Manual})\e$B!#$=\e(B
+\e$B$l$K\e(B @code{"multipart/alternative"} \e$B$r2C$($k$H!"$=$&$$$&%a!<%k$K4^$^$l$F\e(B
+\e$B$$$kFs$D$N%a%G%#%"!&%?%$%W$N$&$A$N0l$D$r<j$GA*$V$3$H$,$G$-$k$h$&$K$J$j$^\e(B
+\e$B$9!#Nc$($P!"$3$N$h$&$K@_Dj$9$k$3$H$,$G$-$^$9\e(B:
+
+@lisp
+(setq gnus-buttonized-mime-types
+      '("multipart/alternative" "multipart/signed")
+      mm-discouraged-alternatives
+      '("text/html" "image/.*"))
+@end lisp
+
+\e$B$3$N>l9g!"\e(BGnus \e$B$O$=$N$h$&$J<oN`$N\e(B spam \e$B%a%C%;!<%8$N$?$a$K!"0J2<$N$h$&$K\e(B
+\e$B%i%8%*%\%?%s$rI=<($9$k$G$7$g$&\e(B:
+
+@example
+1.  (*) multipart/alternative  ( ) image/gif
+
+2.  (*) text/plain          ( ) text/html
+@end example
 
 @item mm-inline-large-images
 @vindex mm-inline-large-images