From: yamaoka Date: Fri, 17 Jan 2003 08:57:25 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_14-00-quimby~9 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5404a50eb811180ea7c38520786ec77c5a77015e;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef7afd8..9b2c2ee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2003-01-17 Simon Josefsson + + * gnus-fun.el (gnus-x-face-from-file): + (gnus-face-from-file): Suggest image format in minibuffer prompt. + + * gnus-fun.el (gnus-convert-image-to-x-face-command) + (gnus-convert-image-to-face-command): Doc fix. + 2003-01-17 Lars Magne Ingebrigtsen * gnus-fun.el (gnus-convert-face-to-png): Protect against errors. diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index 60815bc..da12466 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -36,12 +36,16 @@ :type 'string) (defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface" - "Command for converting an image to an X-Face." + "Command for converting an image to an X-Face. +By default it takes a GIF filename and output the X-Face header data +on stdout." :group 'gnus-fun :type 'string) (defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng" - "Command for converting an image to an X-Face." + "Command for converting an image to an Face. +By default it takes a JPEG filename and output the Face header data +on stdout." :group 'gnus-fun :type 'string) @@ -86,7 +90,7 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-x-face-from-file (file) "Insert an X-Face header based on an image file." - (interactive "fImage file name: ") + (interactive "fImage file name (by default GIF): ") (when (file-exists-p file) (gnus-shell-command-to-string (format gnus-convert-image-to-x-face-command @@ -95,7 +99,7 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-face-from-file (file) "Return an Face header based on an image file." - (interactive "fImage file name: ") + (interactive "fImage file name (by default JPEG): ") (when (file-exists-p file) (let ((done nil) (attempt "")