Merge from trunk.

[gnu-emacs] / lisp / gnus / gnus-fun.el

diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index bc1ebd4a85ff543a6b3ba76278d999f504969d46..1cc113838931a83f4226e05501dad6e434d61af0 100644 (file)
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -1,6 +1,6 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
@@ -54,10 +54,7 @@
   "convert -scale 48x48! %s xbm:- | xbm2xface.pl"
   "Command for converting an image to an X-Face.
 The command must take a image filename (use \"%s\") as input.
-The output must be the Face header data on stdout in PNG format.
-
-By default it takes a GIF filename and output the X-Face header data
-on stdout."
+The output must be the X-Face header data on stdout in PNG format."
   :version "22.1"
   :group 'gnus-fun
   :type '(choice (const :tag "giftopnm, netpbm (GIF input only)"