projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--devo--0
[gnus]
/
lisp
/
gnus-fun.el
diff --git
a/lisp/gnus-fun.el
b/lisp/gnus-fun.el
index
0a07352
..
e9c6d9f
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
;;; 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
;; 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
;; 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,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-26,6
+26,10
@@
;;; Code:
;;; Code:
+;; For Emacs < 22.2.
+(eval-and-compile
+ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
(eval-when-compile
(require 'cl))
(eval-when-compile
(require 'cl))
@@
-34,6
+38,8
@@
(require 'gnus-util)
(require 'gnus)
(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."
:version "22.1"
(defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
"*Directory where X-Face PBM files are stored."
:version "22.1"
@@
-103,6
+109,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)))))))
(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'."
;;;###autoload
(defun gnus-insert-random-x-face-header ()
"Insert a random X-Face header from `gnus-x-face-directory'."
@@
-201,8
+209,14
@@
The colors from this face are used as the foreground and background
colors of the displayed X-Faces."
:group 'gnus-article-headers)
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."
(defun gnus-display-x-face-in-from (data)
"Display the X-Face DATA in the From header."
+ (require 'gnus-art)
(let ((default-enable-multibyte-characters nil)
pbm)
(when (or (gnus-image-type-available-p 'xface)
(let ((default-enable-multibyte-characters nil)
pbm)
(when (or (gnus-image-type-available-p 'xface)