From e230a06e0b0527bb396e6bc0a8411ebc5173a1cc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 11 Dec 2007 05:20:26 +0000 Subject: [PATCH] Move `require's before `eval-when-compile's. Add declare-function compatibility definition. (gnus-extract-address-components): Declare as a function. --- lisp/gnus/spam.el | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index fddebb1d290..f2c18e71d0c 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -40,16 +40,20 @@ ;;{{{ compilation directives and autoloads/requires +;; 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 'spam-report)) -(eval-when-compile (require 'hashcash)) +(require 'message) ;for the message-fetch-field functions (require 'gnus-sum) - (require 'gnus-uu) ; because of key prefix issues ;;; for the definitions of group content classification and spam processors (require 'gnus) -(require 'message) ;for the message-fetch-field functions + +(eval-when-compile (require 'spam-report)) +(eval-when-compile (require 'hashcash)) ;; for nnimap-split-download-body-default (eval-when-compile (require 'nnimap)) @@ -2066,6 +2070,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (autoload 'bbdb-create-internal "bbdb") (autoload 'bbdb-search-simple "bbdb")) +;; Autoloaded in message, which we require. +(declare-function gnus-extract-address-components "gnus-util" (from)) + (eval-and-compile (when (condition-case nil (progn -- 2.39.2