From: yamaoka <yamaoka>
Date: Mon, 3 Apr 2006 22:23:23 +0000 (+0000)
Subject: Synch to No Gnus 200604031806.
X-Git-Tag: t-gnus-6_17_4-quimby-~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=85e1b59b250a5d5c271c3ee379e91f0a87dc3f15;p=elisp%2Fgnus.git-

Synch to No Gnus 200604031806.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d3ba66..47cdfae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-fun.el (gnus-convert-image-to-face-command): Fix typo in
+	doc string.
+
 2006-04-03  Daiki Ueno  <ueno@unixuser.org>
 
 	* pgg-gpg.el (pgg-gpg-process-filter)
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 1db3d20..c9fd88d 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -65,10 +65,10 @@ on stdout."
   "convert -scale 48x48! %s -colors %d png:-"
   "Command for converting an image to a Face.
 
-The command must take an image filename (first format
-argument\"%s\") and the number of colors (second format argument:
-\"%d\") as input.  The output must be the Face header data on
-stdout in PNG format."
+The command must take an image filename (first format argument
+\"%s\") and the number of colors (second format argument: \"%d\")
+as input.  The output must be the Face header data on stdout in
+PNG format."
   :version "22.1"
   :group 'gnus-fun
   :type '(choice (const :tag "djpeg, netpbm (JPG input only)"