nnimap.el (gnutls-negotiate): Silence the byte compiler.

*.el: Fix comment for declare-function.

32 files changed, 51 insertions, 27 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b95fe32431a..a58b2460b21 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lpath.el: Fbind gnutls-negotiate for Emacs 22 and XEmacsen.
+
+	* nnimap.el (gnutls-negotiate): Silence the byte compiler.
+
+	* gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el,
+	gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el,
+	mail-source.el, message.el, mm-bodies.el, mm-decode.el, mm-extern.el,
+	mm-util.el, mm-view.el, mml-smime.el, mml.el, mml1991.el, mml2015.el,
+	nnfolder.el, nnheader.el, nnmail.el, nnmaildir.el, nnrss.el, nntp.el,
+	rfc1843.el, sieve-manage.el, smime.el, spam.el:
+	Fix comment for declare-function.
+
 2010-10-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-request-rename-group): Select group read-only
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 01cbda85fd3..f84b134163c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index 550614f9352..822996069cc 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index bc1ebd4a85f..0f28bf5e5ea 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index b92b608e5db..8c5d6e55f6c 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 3cc7c3701c5..d24f04e0215 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -38,7 +38,7 @@
 ;;
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 91a1784ca20..b354793b056 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; 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/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 1a8d4549b26..29bf4c49938 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 503ec47e39c..5326b938cf4 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -33,7 +33,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index d4bbfe129c4..c944f4a307d 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -30,7 +30,7 @@
 
 (eval '(run-hooks 'gnus-load-hook))
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 80a1d8846d9..1bd5be74013 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d50e037ee00..c9ddba42896 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -29,6 +29,7 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 5756e46b865..5a70f33d95f 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 07249bf0727..8be4bb7047c 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index eee741f7f69..8363fe07c73 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 65543d11bb5..b16e1d9556b 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 82be361fce8..11e475d21ec 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -22,6 +22,8 @@
 ;;; Commentary:
 
 ;;; 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/mml-smime.el b/lisp/gnus/mml-smime.el
index 188717e5921..33050fecaee 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 3cf0f3701fd..43e86cb6c34 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -23,7 +23,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 22eb7b66829..98e7903b015 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -26,8 +26,8 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
 (eval-and-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 
   (if (locate-library "password-cache")
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 675cafe3ac1..55ebf8cbf0d 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -28,8 +28,8 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
 (eval-and-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 
   (if (locate-library "password-cache")
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index c3d0d1cdb91..668b75a7838 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -29,7 +29,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index b97fe5f8079..4bf4588687e 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -27,6 +27,7 @@
 
 ;;; 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/nnimap.el b/lisp/gnus/nnimap.el
index 4c05fb47a40..b58c7473d51 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -26,6 +26,10 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-and-compile
   (require 'nnheader))
 
@@ -284,6 +288,8 @@ textual parts.")
 			(* 5 60)))
 	    (nnimap-send-command "NOOP")))))))
 
+(declare-function gnutls-negotiate "subr" (fn file &optional arglist fileonly))
+
 (defun nnimap-open-connection (buffer)
   (unless nnimap-keepalive-timer
     (setq nnimap-keepalive-timer (run-at-time (* 60 15) (* 60 15)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 01cab6febe3..8ccd7b02a16 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 8a018dc6aca..97531f87666 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -59,7 +59,7 @@
    )
 ]
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 743fba53e52..ebe8c514cb3 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index ced15a92838..946025a0af2 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index e395ee54c3c..87fcde60138 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 3d04a5a939f..5b5439fab73 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -70,7 +70,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index c3ef6898453..e28c07ffaad 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -119,7 +119,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (require 'dig)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 9e193ccea84..448a0088fb8 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -39,7 +39,7 @@
 
 ;;{{{ compilation directives and autoloads/requires
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))