Merge from gnus--rel--5.10

[gnus] / lisp / gnus-fun.el

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 651d82a..162cc7e 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -1,6 +1,6 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -32,6 +32,7 @@
 (require 'mm-util)
 (require 'gnus-ems)
 (require 'gnus-util)
+(require 'gnus)
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
@@ -65,10 +66,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)"
@@ -77,30 +78,6 @@ stdout in PNG format."
                        "convert -scale 48x48! %s -colors %d png:-")
                 (string)))
 
-(defcustom gnus-face-properties-alist (if (featurep 'xemacs)
-                                         '((xface . (:face gnus-x-face)))
-                                       '((pbm . (:face gnus-x-face))
-                                         (png . nil)))
-  "Alist of image types and properties applied to Face and X-Face images.
-Here are examples:
-
-;; Specify the altitude of Face images in the From header.
-\(setq gnus-face-properties-alist
-      '((pbm . (:face gnus-x-face :ascent 80))
-       (png . (:ascent 80))))
-
-;; Show Face images as pressed buttons.
-\(setq gnus-face-properties-alist
-      '((pbm . (:face gnus-x-face :relief -2))
-       (png . (:relief -2))))
-
-See the manual for the valid properties for various image types.
-Currently, `pbm' is used for X-Face images and `png' is used for Face
-images in Emacs.  Only the `:face' property is effective on the `xface'
-image type in XEmacs if it is built with the libcompface library."
-  :group 'gnus-fun
-  :type '(repeat (cons :format "%v" (symbol :tag "Image type") plist)))
-
 (defun gnus-shell-command-to-string (command)
   "Like `shell-command-to-string' except not mingling ERROR."
   (with-output-to-string