aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-06-29 20:01:09 -0700
committerGlenn Morris2011-06-29 20:01:09 -0700
commit5cdea619b2b246aaac5e90014e4d80d3943b17fb (patch)
treeee263ac475731a9d766a6a18a20d5e84bad98d90
parenteeea84f413becfb91ad353c436fadff093f3a2ab (diff)
downloademacs-5cdea619b2b246aaac5e90014e4d80d3943b17fb.tar.gz
emacs-5cdea619b2b246aaac5e90014e4d80d3943b17fb.zip
* lisp/gnus/gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix.
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/gnus-fun.el5
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 76df7a1409d..594bef2f01c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
12011-06-30 Glenn Morris <rgm@gnu.org> 12011-06-30 Glenn Morris <rgm@gnu.org>
2 2
3 * gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix.
4
3 * mm-util.el (mm-charset-synonym-alist): Move definition before use. 5 * mm-util.el (mm-charset-synonym-alist): Move definition before use.
4 6
52011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org> 72011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index cb495623af2..1cc11383893 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -54,10 +54,7 @@
54 "convert -scale 48x48! %s xbm:- | xbm2xface.pl" 54 "convert -scale 48x48! %s xbm:- | xbm2xface.pl"
55 "Command for converting an image to an X-Face. 55 "Command for converting an image to an X-Face.
56The command must take a image filename (use \"%s\") as input. 56The command must take a image filename (use \"%s\") as input.
57The output must be the Face header data on stdout in PNG format. 57The output must be the X-Face header data on stdout in PNG format."
58
59By default it takes a GIF filename and output the X-Face header data
60on stdout."
61 :version "22.1" 58 :version "22.1"
62 :group 'gnus-fun 59 :group 'gnus-fun
63 :type '(choice (const :tag "giftopnm, netpbm (GIF input only)" 60 :type '(choice (const :tag "giftopnm, netpbm (GIF input only)"