X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-fun.el;h=cb495623af20bccb51936b5a715502917cfcd69e;hb=1e650041dc5387301fd3320bb29d06b0f3324b6b;hp=6e2fc0c344f97eecb897e442eb64d1aa675bb5f7;hpb=d4af6e4ca75fc578c285eaf103c2277f71c6b6f4;p=gnus

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 6e2fc0c34..cb495623a 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -1,37 +1,42 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-when-compile
   (require 'cl))
 
 (require 'mm-util)
 (require 'gnus-ems)
 (require 'gnus-util)
+(require 'gnus)
+
+(defvar gnus-face-properties-alist)
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
@@ -65,10 +70,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 +82,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
@@ -126,6 +107,8 @@ Output to the current buffer, replace text, and don't mingle error."
 	 (format gnus-convert-pbm-to-x-face-command
 		 (shell-quote-argument file)))))))
 
+(autoload 'message-goto-eoh "message" nil t)
+
 ;;;###autoload
 (defun gnus-insert-random-x-face-header ()
   "Insert a random X-Face header from `gnus-x-face-directory'."
@@ -224,10 +207,15 @@ The colors from this face are used as the foreground and background
 colors of the displayed X-Faces."
   :group 'gnus-article-headers)
 
+(declare-function article-narrow-to-head   "gnus-art" ())
+(declare-function gnus-article-goto-header "gnus-art" (header))
+(declare-function gnus-add-image           "gnus-art" (category image))
+(declare-function gnus-add-wash-type       "gnus-art" (type))
+
 (defun gnus-display-x-face-in-from (data)
   "Display the X-Face DATA in the From header."
-  (let ((default-enable-multibyte-characters nil)
-	pbm)
+  (require 'gnus-art)
+  (let (pbm)
     (when (or (gnus-image-type-available-p 'xface)
 	      (and (gnus-image-type-available-p 'pbm)
 		   (setq pbm (uncompface data))))
@@ -302,5 +290,4 @@ colors of the displayed X-Faces."
 
 (provide 'gnus-fun)
 
-;;; arch-tag: 9d000a69-15cc-4491-9dc0-4627484f50c1
 ;;; gnus-fun.el ends here