[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-fun.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/11 05:46:37

Index: gnus-fun.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/gnus-fun.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnus-fun.el 16 Nov 2007 16:50:34 -0000      1.14
+++ gnus-fun.el 11 Dec 2007 05:46:37 -0000      1.15
@@ -26,6 +26,10 @@
 
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-when-compile
   (require 'cl))
 
@@ -105,6 +109,8 @@
         (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'."
@@ -203,8 +209,14 @@
 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."
+  (require 'gnus-art)
   (let ((default-enable-multibyte-characters nil)
        pbm)
     (when (or (gnus-image-type-available-p 'xface)