From 20ec42923ac27d54808062236e4335063e78c252 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 23 Jan 2003 01:51:04 +0000 Subject: [PATCH] Synch with Oort Gnus. --- texi/ChangeLog | 6 +++ texi/gnus-ja.texi | 108 +++++++++++++++++++-------------------------------- texi/gnus.texi | 112 +++++++++++++++++++---------------------------------- 3 files changed, 85 insertions(+), 141 deletions(-) diff --git a/texi/ChangeLog b/texi/ChangeLog index ddf9f57..47c5944 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2003-01-23 Jesper Harder + + * gnus.texi (Signing and encrypting): Index. + (Smileys): Update. + (Toolbar): Move to XVarious because it's XEmacs specific. + 2003-01-22 Jesper Harder * gnus.texi (Picons): Update. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6736bca..782fd44 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -969,7 +969,6 @@ Image Enhancements * Smileys:: $BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<((B $B$9$kJ}K!(B * X-Face:: $B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k(B -* Toolbar:: $B%/%j%C%/1n(B * XVarious:: $B$=$NB>$N(B XEmacs $B$G(B Gnus $B$JJQ?t(B Thwarting Email Spam @@ -10938,6 +10937,9 @@ format or @sc{pgp/mime} or @sc{s/mime}. For decoding such messages, see the @code{mm-verify-option} and @code{mm-decrypt-option} options (@pxref{Security}). +@vindex gnus-message-replysign +@vindex gnus-message-replyencrypt +@vindex gnus-message-replysignencrypted Often, you would like to sign replies to people who send you signed messages. Even more often, you might want to encrypt messages which are in reply to encrypted messages. Gnus offers @@ -20252,7 +20254,6 @@ gnus $B$O$3$l$rMxMQ$9$k$3$H$K$7$^$9!#(B * Smileys:: $BI=<($5$l$k$Y$/@8$^$l$?9,$;$=$&$J4i$rI=<((B $B$9$kJ}K!(B * X-Face:: $B%U%!%s%-!<$J$A$C$A$c$JGr9u$N3($rI=<($9$k(B -* Toolbar:: $B%/%j%C%/1n(B * XVarious:: $B$=$NB>$N(B XEmacs $B$G(B Gnus $B$JJQ?t(B @end menu @@ -20356,52 +20357,27 @@ Picon $B$N%U%!%$%kL>$H$7$F;n$7$F$_$k3HD%;R$N=gHV%j%9%H$G$9!#%G%#%U%)%k%H$O!"(B (setq gnus-treat-display-smileys t) @end lisp -$B%9%^%$%j!<$O!"J8;z$N4i%^!<%/(B --- @samp{:-)}, @samp{:-=}, @samp{:-(} $B$J$I(B +$B%9%^%$%j!<$O!"J8;z$N4i%^!<%/(B --- @samp{:-)}, @samp{8-)}, @samp{:-(} $B$J$I(B $B$H$$$C$?$b$N(B --- $B$r3($KBP1~$5$;!"J8;z$N4i%^!<%/$NBe$o$j$K$=$N3($rI=<($7(B $B$^$9!#$3$NJQ49$OJ8;z$K%^%C%A$9$k@55,I=8=$H$=$l$N%U%!%$%kL>$X$NBP1~$N%j%9(B $B%H$G@)8f$5$l$^$9!#(B -@vindex smiley-nosey-regexp-alist -@vindex smiley-deformed-regexp-alist -$B%9%^%$%j!<$O=i4|@_Dj$G$OFs$D$NJQ49O"A[%j%9%H$NNc$rDs6!$7$F$$$^$9!#(B -@code{smiley-deformed-regexp-alist} (@samp{:)}, @samp{:(} $B$J$I$K%^%C%A(B -$B$9$k(B) $B$H!"(B@code{smiley-nosey-regexp-alist} (@samp{:-)}, @samp{:-(} $B$J$I(B -$B$K%^%C%A$9$k(B) $B$G$9!#(B +@vindex smiley-regexp-alist +$B;H$o$l$kO"A[%j%9%H$O!"JQ?t(B @code{smiley-regexp-alist} $B$G@_Dj$7$^$9!#3FMW(B +$BAG$N:G=i$N9`L\$O%^%C%A$5$;$?$$@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$($?$$(B +$B%0%k!<%W$K%^%C%A$9$k@55,I=8=!"$=$7$F;0HVL\$NMWAG$OI=<($5$;$?$$%U%!%$%k$N(B +$BL>A0$G$9!#(B -$B;HMQ$5$l$kO"A[%j%9%H$O(B @code{smiley-regexp-alist} $BJQ?t$G;XDj$5$l$^$9!#$3(B -$B$N=i4|@_DjCM$O(B @code{smiley-deformed-regexp-alist} $B$G$9!#(B - -$B3FMWAG$N:G=i$N9`L\$O%^%C%A$5$;$?$$@55,I=8=$G!"FsHVL\$NMWAG$O3($GCV$-49$((B -$B$?$$%0%k!<%W$K%^%C%A$9$k@55,I=8=!"$=$7$F;0HVL\$NMWAG$OI=<($5$;$?$$%U%!%$(B -$B%k$NL>A0$G$9!#(B - -$B0J2<$NJQ?t$O!"%9%^%$%j!<$,$3$l$i$N%U%!%$%k$rC5$9>l=j!"$"$k$$$O$I$N?'$r;H(B -$B$&$+$H!"$=$NB>$N$b$N$r%+%9%?%^%$%:$7$^$9!#(B +$B0J2<$NJQ?t$O!"%9%^%$%j!<$,$3$l$i$N%U%!%$%k$rC5$9>l=j$r%+%9%?%^%$%:$7$^$9(B: @table @code @item smiley-data-directory @vindex smiley-data-directory $B%9%^%$%j!<$,4i%U%!%$%k$rC5$9>l=j!#(B -@item smiley-flesh-color -@vindex smiley-flesh-color -$BH)$N?'!#=i4|@_DjCM$O!"?M$H$7$F;n$7$F$_$k3HD%;R$N%j%9%H$G$9!#(B @end table @node X-Face @@ -20489,35 +20465,6 @@ gnus $B$O!"30$K=P$9%a%C%;!<%8$K(B X-Face $B%X%C%@!<$r4JC1$KA^F~$9$k$?$a$N!"JX "~/My-face.gif")))))) @end lisp -@node Toolbar -@subsection $B%D!<%k%P!<(B - -@table @code -@iftex -@iflatex -\margindex{} -@end iflatex -@end iftex - -@item gnus-use-toolbar -@vindex gnus-use-toolbar -@code{nil} $B$J$i$P%D!<%k%P!<$rI=<($7$J$$!#(B@code{nil} $B0J30$N>l9g$O!"(B -@code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar}, @code{right-toolbar}, @code{left-toolbar} $B$N(B -$B$I$l$+$G$J$/$F$O$J$j$^$;$s!#(B - -@item gnus-group-toolbar -@vindex gnus-group-toolbar -$B%0%k!<%W%P%C%U%!Fb$N%D!<%k%P!l9g$O!"(B +@code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar}, +@code{right-toolbar}, @code{left-toolbar} $B$N$I$l$+$G$J$/$F$O$J$j$^$;$s!#(B + +@item gnus-group-toolbar +@vindex gnus-group-toolbar +$B%0%k!<%W%P%C%U%!Fb$N%D!<%k%P!<$G$9!#(B + +@item gnus-summary-toolbar +@vindex gnus-summary-toolbar +$B35N,%P%C%U%!Fb$N%D!<%k%P!<$G$9!#(B + +@item gnus-summary-mail-toolbar +@vindex gnus-summary-mail-toolbar +$B%a!<%k%0%k!<%W$N35N,%P%C%U%!Fb$N%D!<%k%P!<$G$9!#(B +@end table @iftex @iflatex \margindex{} @end iflatex @end iftex -@end table @node Fuzzy Matching @section $B%U%!%8!<$J0lCW(B diff --git a/texi/gnus.texi b/texi/gnus.texi index a647ad8..b3f0bd0 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -851,7 +851,6 @@ Image Enhancements * Picons:: How to display pictures of what you're reading. * Smileys:: Show all those happy faces the way they were meant to be shown. * X-Face:: Display a funky, teensy black-and-white image. -* Toolbar:: Click'n'drool. * XVarious:: Other XEmacsy Gnusey variables. Thwarting Email Spam @@ -11491,6 +11490,9 @@ format or @sc{pgp/mime} or @sc{s/mime}. For decoding such messages, see the @code{mm-verify-option} and @code{mm-decrypt-option} options (@pxref{Security}). +@vindex gnus-message-replysign +@vindex gnus-message-replyencrypt +@vindex gnus-message-replysignencrypted Often, you would like to sign replies to people who send you signed messages. Even more often, you might want to encrypt messages which are in reply to encrypted messages. Gnus offers @@ -20705,7 +20707,6 @@ Gnus has taken advantage of that. * Picons:: How to display pictures of what you're reading. * Smileys:: Show all those happy faces the way they were meant to be shown. * X-Face:: Display a funky, teensy black-and-white image. -* Toolbar:: Click'n'drool. * XVarious:: Other XEmacsy Gnusey variables. @end menu @@ -20808,27 +20809,20 @@ In short---to use Smiley in Gnus, put the following in your (setq gnus-treat-display-smileys t) @end lisp -Smiley maps text smiley faces---@samp{:-)}, @samp{:-=}, @samp{:-(} and +Smiley maps text smiley faces---@samp{:-)}, @samp{8-)}, @samp{:-(} and the like---to pictures and displays those instead of the text smiley faces. The conversion is controlled by a list of regexps that matches text and maps that to file names. -@vindex smiley-nosey-regexp-alist -@vindex smiley-deformed-regexp-alist -Smiley supplies two example conversion alists by default: -@code{smiley-deformed-regexp-alist} (which matches @samp{:)}, @samp{:(} -and so on), and @code{smiley-nosey-regexp-alist} (which matches -@samp{:-)}, @samp{:-(} and so on). - -The alist used is specified by the @code{smiley-regexp-alist} variable, -which defaults to the value of @code{smiley-deformed-regexp-alist}. - -The first item in each element is the regexp to be matched; the second -element is the regexp match group that is to be replaced by the picture; -and the third element is the name of the file to be displayed. +@vindex smiley-regexp-alist +The alist used is specified by the @code{smiley-regexp-alist} +variable. The first item in each element is the regexp to be matched; +the second element is the regexp match group that is to be replaced by +the picture; and the third element is the name of the file to be +displayed. The following variables customize where Smiley will look for these -files, as well as the color to be used and stuff: +files: @table @code @@ -20836,25 +20830,9 @@ files, as well as the color to be used and stuff: @vindex smiley-data-directory Where Smiley will look for smiley faces files. -@item smiley-flesh-color -@vindex smiley-flesh-color -Skin color. The default is @samp{yellow}, which is really racist. - -@item smiley-features-color -@vindex smiley-features-color -Color of the features of the face. The default is @samp{black}. - -@item smiley-tongue-color -@vindex smiley-tongue-color -Color of the tongue. The default is @samp{red}. - -@item smiley-circle-color -@vindex smiley-circle-color -Color of the circle around the face. The default is @samp{black}. - -@item smiley-mouse-face -@vindex smiley-mouse-face -Face used for mouse highlighting over the smiley face. +@item gnus-smiley-file-types +@vindex gnus-smiley-file-types +List of suffixes on smiley file names to try. @end table @@ -20951,38 +20929,6 @@ Using the last function would be something like this: @end lisp -@node Toolbar -@subsection Toolbar - -@table @code - -@iftex -@iflatex -\margindex{} -@end iflatex -@end iftex - -@item gnus-use-toolbar -@vindex gnus-use-toolbar -If @code{nil}, don't display toolbars. If non-@code{nil}, it should be -one of @code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar}, -@code{right-toolbar}, or @code{left-toolbar}. - -@item gnus-group-toolbar -@vindex gnus-group-toolbar -The toolbar in the group buffer. - -@item gnus-summary-toolbar -@vindex gnus-summary-toolbar -The toolbar in the summary buffer. - -@item gnus-summary-mail-toolbar -@vindex gnus-summary-mail-toolbar -The toolbar in the summary buffer of mail groups. - -@end table - - @node XVarious @subsection Various XEmacs Variables @@ -21010,16 +20956,38 @@ Valid values include @code{flame}, @code{pine}, @code{moss}, A glyph displayed in all Gnus mode lines. It is a tiny gnu head by default. +@end table + +@subsubsection Toolbar + +@table @code + +@item gnus-use-toolbar +@vindex gnus-use-toolbar +If @code{nil}, don't display toolbars. If non-@code{nil}, it should be +one of @code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar}, +@code{right-toolbar}, or @code{left-toolbar}. + +@item gnus-group-toolbar +@vindex gnus-group-toolbar +The toolbar in the group buffer. + +@item gnus-summary-toolbar +@vindex gnus-summary-toolbar +The toolbar in the summary buffer. + +@item gnus-summary-mail-toolbar +@vindex gnus-summary-mail-toolbar +The toolbar in the summary buffer of mail groups. + +@end table + @iftex @iflatex \margindex{} @end iflatex @end iftex -@end table - - - @node Fuzzy Matching @section Fuzzy Matching -- 1.7.10.4