* gnus-compat.el (gnus-compat): Declare `declare-function' only here

Instead of in all files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30fcc3b..be1c235 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-01  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-compat.el (gnus-compat): Declare `declare-function' only here
+       instead of in all files.
+
        * dns.el (network-interface-list): Define for XEmacs.
 
        * gnus-notifications.el (gravatar-retrieve-synchronously): Declare for

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 2ad0183..8ff2857 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -26,6 +26,9 @@
 
 (defvar dgnushack-default-load-path (copy-sequence load-path))
 
+(unless (fboundp 'declare-function)
+  (defmacro declare-function (&rest r)))
+
 (defalias 'facep 'ignore)
 
 (require 'cl)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index f8bdca6..0b0f1dd 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -24,9 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 (defvar tool-bar-map)

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index d58acbd..544d667 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -24,10 +24,6 @@
 
 ;;; 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 'gnus)

diff --git a/lisp/gnus-compat.el b/lisp/gnus-compat.el
index deaf2f9..12a8587 100644 (file)
--- a/lisp/gnus-compat.el
+++ b/lisp/gnus-compat.el
@@ -141,6 +141,9 @@ one is kept."
        (setq tail (cdr tail))))
     list))
 
+(unless (fboundp 'declare-function)
+  (defmacro declare-function (&rest r)))
+
 (provide 'gnus-compat)
 
 ;; gnus-compat.el ends here

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 0ffa71d..1e95caf 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile
   (require 'cl))
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index eb8421c..fcd6817 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile
   (require 'cl))
 (defvar tool-bar-mode)

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 90947fe..540694f 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -28,10 +28,6 @@
 
 ;;; 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 'gnus-art)

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 83629df..0530167 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -37,10 +37,6 @@
 ;;
 ;;; 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 'gnus)

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 54714d5..e11ddc4 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -24,9 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile (require 'cl))
 (defvar gnus-newsrc-file-version)
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9079e25..0ed921f 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -24,9 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 (eval-when-compile

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index a3038a1..6297757 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -32,9 +32,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index a20bf03..8164263 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -28,10 +28,6 @@
 
 (eval '(run-hooks 'gnus-load-hook))
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile (require 'cl))
 (require 'wid-edit)
 (require 'mm-util)

diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index 2224884..fb8dfba 100644 (file)
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -47,10 +47,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile (require 'cl))      ; for case
 
 (defgroup hashcash nil

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index d54377f..51b9c91 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'format-spec)
 (eval-when-compile
   (require 'cl)

diff --git a/lisp/message.el b/lisp/message.el
index 31af76c..86a4d02 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -28,9 +28,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
   (require 'cl))
 

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 4972459..c2f6df9 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -23,10 +23,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'mm-util)
 (require 'rfc2047)
 (require 'mm-encode)

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index fee48fd..a99e7a4 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -23,10 +23,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'mail-parse)
 (require 'mm-bodies)
 (eval-when-compile (require 'cl))

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index 882c854..d574b9d 100644 (file)
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -24,10 +24,6 @@
 
 ;;; 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)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 38ee8a5..0d02e1d 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -23,10 +23,6 @@
 
 ;;; 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 'mail-prsvr)
 

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 99594a2..27f772c 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -22,9 +22,6 @@
 
 ;;; 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 'mail-parse)
 (require 'mailcap)

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index bd7a50f..caa1380 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -24,10 +24,6 @@
 
 ;;; 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 'smime)

diff --git a/lisp/mml.el b/lisp/mml.el
index 439d7c5..cf90257 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -22,10 +22,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'mm-util)
 (require 'mm-bodies)
 (require 'mm-encode)

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 8c698ed..2663107 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -26,9 +26,6 @@
 ;;; Code:
 
 (eval-and-compile
-  ;; For Emacs <22.2 and XEmacs.
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
-
   (if (locate-library "password-cache")
       (require 'password-cache)
     (require 'password)))

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 9fc8f6e..7d6aa33 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -28,9 +28,6 @@
 ;;; Code:
 
 (eval-and-compile
-  ;; For Emacs <22.2 and XEmacs.
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
-
   (if (locate-library "password-cache")
       (require 'password-cache)
     (require 'password)))

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 3e917b4..764314d 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 1a799d3..a403f39 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -28,10 +28,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'nnheader)
 (require 'message)
 (require 'nnmail)

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 3ce3dfa..994c2d0 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -26,9 +26,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile (require 'cl))
 
 (defvar nnmail-extra-headers)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 886b075..ff20075 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -26,10 +26,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-and-compile
   (require 'nnheader)
   ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 7088bbb..f95c0bb 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -171,10 +171,6 @@
 
 ;;; Setup:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'nnoo)
 (require 'gnus-group)
 (require 'message)

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 6c6025b..d88a1bf 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -24,10 +24,6 @@
 
 ;;; 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 'gnus)                                ; for macro gnus-kill-buffer, at least

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 7d33e51..21fa5b3 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -59,10 +59,6 @@
    )
 ]
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'nnheader)
 (require 'gnus)
 (require 'gnus-util)

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 40d3dc9..02a9513 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -24,10 +24,6 @@
 
 ;;; 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 'gnus)

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 5ef1398..6035162 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -25,9 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
   ;; `make-network-stream'.
   (unless (fboundp 'open-protocol-stream)

diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index 09c2b72..74e8f12 100644 (file)
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -31,10 +31,6 @@
 
 ;;; 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)
 

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index fd97c7d..62d185e 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -71,10 +71,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (if (locate-library "password-cache")
     (require 'password-cache)
   (require 'password))

diff --git a/lisp/smime.el b/lisp/smime.el
index 4a763ca..bcebe3d 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -118,9 +118,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
 
 (if (locate-library "password-cache")

diff --git a/lisp/spam.el b/lisp/spam.el
index 82f98c4..664ac53 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -38,10 +38,6 @@
 
 ;;{{{ compilation directives and autoloads/requires
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (eval-when-compile (require 'cl))
 
 (require 'message)              ;for the message-fetch-field functions