From 087de016ff0f6c9cfe8a9ecbb9b57e10edeff89f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 14 Feb 2002 22:51:52 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-fun.el | 38 ++++++++++++++++++++++++-------------- texi/ChangeLog | 4 ++++ texi/gnus-ja.texi | 41 ++++++++++++++++++++++------------------- texi/gnus.texi | 7 +++++-- 5 files changed, 65 insertions(+), 35 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 706602c..763e02b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2002-02-14 ShengHuo ZHU + + * gnus-fun.el (gnus-shell-command-to-string): New function. + (gnus-shell-command-on-region): New function. + (gnus-random-x-face): Use them. + (gnus-x-face-from-file): Ditto. + (gnus-convert-image-to-gray-x-face): Ditto. + (gnus-convert-gray-x-face-to-xpm): Ditto. + (gnus-convert-image-to-x-face-command): Don't use 2>/dev/null. + 2002-02-14 Katsumi Yamaoka * gnus-art.el (gnus-treat-display-xface): Don't use diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index 6cfd5d9..7d5f5ee 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -35,11 +35,24 @@ :group 'gnus-fun :type 'string) -(defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface" +(defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface" "Command for converting a GIF to an X-Face." :group 'gnus-fun :type 'string) +(defun gnus-shell-command-to-string (command) + "Like `shell-command-to-string' except not mingling ERROR." + (with-output-to-string + (call-process shell-file-name nil (list standard-output nil) + nil shell-command-switch command))) + +(defun gnus-shell-command-on-region (start end command) + "A simplified `shell-command-on-region'. +Output to the current buffer, replace text, and don't mingle error." + (call-process-region start end shell-file-name t + (list (current-buffer) nil) + nil shell-command-switch command)) + ;;;###autoload (defun gnus-random-x-face () "Insert a random X-Face header from `gnus-x-face-directory'." @@ -48,7 +61,7 @@ (let* ((files (directory-files gnus-x-face-directory t "\\.pbm$")) (file (nth (random (length files)) files))) (when file - (shell-command-to-string + (gnus-shell-command-to-string (format gnus-convert-pbm-to-x-face-command (shell-quote-argument file))))))) @@ -57,7 +70,7 @@ "Insert an X-Face header based on an image file." (interactive "fImage file name:" ) (when (file-exists-p file) - (shell-command-to-string + (gnus-shell-command-to-string (format gnus-convert-image-to-x-face-command (shell-quote-argument file))))) @@ -76,8 +89,8 @@ (push (cons (* step i) i) color-alist))) (when (file-exists-p file) (with-temp-buffer - (insert (shell-command-to-string - (format "giftopnm %s | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmquant -fs -map %s 2>/dev/null | ppmtopgm | pnmnoraw" + (insert (gnus-shell-command-to-string + (format "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant -fs -map %s | ppmtopgm | pnmnoraw" (shell-quote-argument file) mapfile))) (goto-char (point-min)) @@ -91,11 +104,10 @@ (insert "P1\n48 48\n") (dolist (bits bits-list) (insert (if (zerop (logand bits mask)) "0 " "1 "))) - (shell-command-on-region + (gnus-shell-command-on-region (point-min) (point-max) ;; the following is taken from xbmtoikon: - "pbmtoicon | sed '/^[ ]*[*\\\\/]/d; s/[ ]//g; s/,$//' | tr , '\\012' | sed 's/^0x//; s/^/0x/' | pr -l1 -t -w22 -3 -s, | sed 's/,*$/,/' | compface" - (current-buffer) t) + "pbmtoicon | sed '/^[ ]*[*\\\\/]/d; s/[ ]//g; s/,$//' | tr , '\\012' | sed 's/^0x//; s/^/0x/' | pr -l1 -t -w22 -3 -s, | sed 's/,*$/,/' | compface") (push (buffer-string) x-faces)))) (dotimes (i (length x-faces)) (insert (if (zerop i) "X-Face:" (format "X-Face-%s:" i)) @@ -112,10 +124,9 @@ (setq bit-list nil) (with-temp-buffer (insert (uncompface face)) - (shell-command-on-region + (gnus-shell-command-on-region (point-min) (point-max) - "pnmnoraw 2>/dev/null" - (current-buffer) t) + "pnmnoraw") (goto-char (point-min)) (forward-line 2) (while (not (eobp)) @@ -138,10 +149,9 @@ (insert "P2\n48 48\n255\n") (dolist (pixel pixels) (insert (number-to-string (* scale pixel)) " ")) - (shell-command-on-region + (gnus-shell-command-on-region (point-min) (point-max) - "ppmtoxpm 2>/dev/null" - (current-buffer) t) + "ppmtoxpm") (buffer-string))))) ;;;###autoload diff --git a/texi/ChangeLog b/texi/ChangeLog index 8185a98..4ba5d65 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2002-02-14 ShengHuo ZHU + + * gnus.texi (Document Groups): Addition. + 2002-02-13 Katsumi Yamaoka * message.texi (Security): Fix @findex for the key `C-c C-m s p'. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index e9d3dd3..1adac97 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -2908,10 +2908,10 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$ $B4|8B@Z$l>C5n2DG=$H$9$G$KJV?.$7$?5-;v0J30$N$9$Y$F$rI=<($7$^$9!#(B @end table -$BMxMQ$G$-$k1i;;;R$O(B @code{not}$B!"(B@code{and} $B$*$h$S(B @code{or} $B$G$9!#=R8l(B -$B$O(B @code{tick}$B!"(B@code{unsend}$B!"(B@code{undownload}$B!"(B@code{unread}$B!"(B -@code{dormant}$B!"(B@code{expire}$B!"(B@code{reply}$B!"(B@code{killed}$B!"(B -@code{bookmark}$B!"(B@code{score}$B!"(B@code{save}$B!"(B@code{cache}$B!"(B@code{forward}$B!"(B +$BMxMQ$G$-$k1i;;;R$O(B @code{not}, @code{and} $B$*$h$S(B @code{or} $B$G$9!#=R8l(B +$B$O(B @code{tick}, @code{unsend}, @code{undownload}, @code{unread}, +@code{dormant}, @code{expire}, @code{reply}, @code{killed}, +@code{bookmark}, @code{score}, @code{save}, @code{cache}, @code{forward}, @code{unseen} $B$*$h$S(B @code{recent} $B$r4^$_$^$9!#(B @end table @@ -6549,10 +6549,10 @@ gnus $B$OA4$F$N5-;v$N40A4$J(B @code{References} $BMs$r8+$F!"F1$8%9%l%C%I$KB0$ $B$H$,$G$-$^$9!#$=$l$O!"C1FH$N4X?t!"4X?t$N%j%9%H!"4X?t$H(B @code{($B4X?t$G$J$$(B $B$b$N(B)} $B$NMWAG$G$"$k$3$H$,$G$-$^$9!#%G%#%U%)%k%H$G$O!"JB$SBX$($O5-;vHV9f(B $B$K$h$C$F$J$5$l$^$9!#4{$K:n$i$l$F$$$kJB$SBX$(=R8l4X?t(B -$B$O(B @code{gnus-thread-sort-by-number}$B!"(B@code{gnus-thread-sort-by-author}$B!"(B -@code{gnus-thread-sort-by-subject}$B!"(B@code{gnus-thread-sort-by-date}$B!"(B -@code{gnus-thread-sort-by-score}$B!"(B -@code{gnus-thread-sort-by-most-recent-number}$B!"(B +$B$O(B @code{gnus-thread-sort-by-number}, @code{gnus-thread-sort-by-author}, +@code{gnus-thread-sort-by-subject}, @code{gnus-thread-sort-by-date}, +@code{gnus-thread-sort-by-score}, +@code{gnus-thread-sort-by-most-recent-number}, @code{gnus-thread-sort-by-most-recent-date} $B$*$h$S(B @code{gnus-thread-sort-by-total-score} $B$G$9!#(B @@ -6764,7 +6764,7 @@ Gnus $B$O$"$J$?$,FI$`$G$"$m$&5-;v$h$j$b$?$/$5$s$N5-;v$rJ}$NJQ?t$N=i4|CM$O(B @code{nil} $B$G$9!#$b$7%0%k!<%W$,N>J}$N@55,I=8=$K(B $B9gCW$9$k$H!"$=$N%0%k!<%W$O%-%c%C%7%e$5$l$^$;$s!#(B @@ -7780,7 +7780,7 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$ $B$O(B @code{banner} $B%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$r%P%J!<(B $B$rC5n$5$l$k%F%-%9%H$K9g(B $BCW$9$k@55,I=8=$H$7$F2r$,>C5n$5$l$k$H$$$&(B -$B0UL#$G$"$k%7%s%\%k(B @code{signature}$B!"$^$?(B +$B0UL#$G$"$k%7%s%\%k(B @code{signature} $B$^$?(B $B$O(B @code{gnus-article-banner-alist} $B$N@55,I=8=$KBP1~$7$?%7%s%\%k$G$"$k$3(B $B$H$,$G$-$^$9!#(B @@ -11616,7 +11616,7 @@ Gnus $B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/(B $B:#$d!"$N%0%k!<%W$HF1$8$h$&$KFI$`;v$,$G$-$^(B $B$9!#(B @@ -12066,8 +12066,8 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B @end lisp @item webmail -@uref{www.hotmail.com}$B!"(B@uref{webmail.netscape.com}$B!"(B -@uref{www.netaddress.com}$B!"(B@uref{www.my-deja.com} $B$J$I$N%&%'%V%a!<%k%5!<(B +@uref{www.hotmail.com}, @uref{webmail.netscape.com}, +@uref{www.netaddress.com}, @uref{www.my-deja.com} $B$J$I$N%&%'%V%a!<%k%5!<(B $B%P!<$+$i%a!<%k$re!#(B(Mule for Windows $B$G$OF0$-$^$;$s!#(B) Gnus $B$OFs$D$NCJ3,$N=[4D$G3+H/$5$l$F$$$^$9!#:G=i$NCJ3,(B $B$O(B @samp{ding@@gnus.org} $B$G$N$?$/$5$s$N5DO@$,$"$j!"$=$3$GJQ99$d?7$7$$5!(B $BG=$rDs0F$7$^$9!#$3$NCJ3,$O(B @dfn{$B%"%k%U%!(B} $BCJ3,$H8F$P$l$^$9!#$H$$$&$N$O!"(B -$B$3$NCJ3,$G%j%j!<%9$5$l$?(B Gnusae $B$O(B @dfn{$B%"%k%U%!%j%j!<%9(B}$B!"$b$7$/$O(B ($BB>(B +$B$3$NCJ3,$G%j%j!<%9$5$l$?(B Gnusae $B$O(B @dfn{$B%"%k%U%!%j%j!<%9(B} $B$b$7$/$O(B ($BB>(B $B$NCDBN$G$O$h$jNI$/;H$o$l$k(B) @dfn{$B%9%J%C%W%7%g%C%H(B} $B$H8F$P$l$k$b$N$@$+$i(B $B$G$9!#$3$NCJ3,$G$O!"(Bgnus $B$OIT0BDj$G$"$k$H9M$($i$l$F$*$j!"0lHL$NMxMQJ}$N$$$m$$$m$J%P%C%/%(%s%I$,M?$($?5-;v$rF@$^(B @item $B4pK\(B (native) @cindex native Gnus $B$O$$$D$b0l$D$NJ}K!(B ($B$H%P%C%/%(%s%I(B) $B$r%K%e!<%9$rF@$k$?$a$N(B @dfn{$B4p(B -$BK\(B}$B!"$b$7$/$O=i4|@_Dj(B $B$H$7$F;H$$$^$9!#(B +$BK\(B} $B$b$7$/$O=i4|@_Dj(B $B$H$7$F;H$$$^$9!#(B @item $B30It(B (foreign) @cindex foreign diff --git a/texi/gnus.texi b/texi/gnus.texi index 9ad30d3..8d2b8d0 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -15192,6 +15192,9 @@ A digest of Clarinet brief news items. @item slack-digest Non-standard digest format---matches most things, but does it badly. + +@item mail-in-mail +The last resort. @end table You can also use the special ``file type'' @code{guess}, which means @@ -15222,8 +15225,8 @@ Virtual server variables: This should be one of @code{mbox}, @code{babyl}, @code{digest}, @code{news}, @code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934}, @code{rfc822-forward}, @code{mime-parts}, @code{standard-digest}, -@code{slack-digest}, @code{clari-briefs}, @code{nsmail}, -@code{outlook}, @code{oe-dbx}, and @code{mailman} or @code{guess}. +@code{slack-digest}, @code{clari-briefs}, @code{nsmail}, @code{outlook}, +@code{oe-dbx}, @code{mailman}, and @code{mail-in-mail} or @code{guess}. @item nndoc-post-type @vindex nndoc-post-type -- 1.7.10.4