From: Glenn Morris <rgm@gnu.org>
Date: Tue, 11 Dec 2007 05:46:37 +0000 (+0000)
Subject: Add declare-function compatibility definition.
X-Git-Tag: emacs-pretest-23.0.90~8950
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25fcd06c74258a8cca74ab23ab7caa2886df0fc1;p=emacs.git

Add declare-function compatibility definition.
(message-goto-eoh): Autoload.
(article-narrow-to-head, gnus-article-goto-header)
(gnus-add-image, gnus-add-wash-type): Declare as functions.
(gnus-display-x-face-in-from): Require gnus-art.
---

diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 05454960e38..e9c6d9fd816 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -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 @@ 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'."
@@ -203,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)
 
+(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)