# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1286839773 0
# Node ID 236342431786bdb17200d605d0035a9c902df120
# Parent  3243e7055d493e046b529329f636f1696fbee318
nnimap.el (gnutls-negotiate): Silence the byte compiler.
*.el: Fix comment for declare-function.

diff -r 3243e7055d49 -r 236342431786 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/ChangeLog	Mon Oct 11 23:29:33 2010 +0000
@@ -1,3 +1,8 @@
+2010-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mail/hashcash.el, net/imap.el, pgg-parse.el, pgg.el:
+	Fix comment for declare-function.
+
 2010-10-11  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.el (custom-fix-face-spec): New function; code moved from
diff -r 3243e7055d49 -r 236342431786 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/ChangeLog	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-art.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-cache.el
--- a/lisp/gnus/gnus-cache.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-cache.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-fun.el
--- a/lisp/gnus/gnus-fun.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-fun.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-group.el
--- a/lisp/gnus/gnus-group.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-group.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-picon.el
--- a/lisp/gnus/gnus-picon.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-picon.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-spec.el
--- a/lisp/gnus/gnus-spec.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-spec.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-sum.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus-util.el
--- a/lisp/gnus/gnus-util.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus-util.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/gnus.el
--- a/lisp/gnus/gnus.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/gnus.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mail-source.el
--- a/lisp/gnus/mail-source.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mail-source.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/message.el
--- a/lisp/gnus/message.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/message.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mm-bodies.el
--- a/lisp/gnus/mm-bodies.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mm-bodies.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mm-decode.el
--- a/lisp/gnus/mm-decode.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mm-decode.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mm-extern.el
--- a/lisp/gnus/mm-extern.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mm-extern.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mm-util.el
--- a/lisp/gnus/mm-util.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mm-util.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mm-view.el
--- a/lisp/gnus/mm-view.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mm-view.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mml-smime.el
--- a/lisp/gnus/mml-smime.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mml-smime.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mml.el
--- a/lisp/gnus/mml.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mml.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mml1991.el
--- a/lisp/gnus/mml1991.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mml1991.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/mml2015.el
--- a/lisp/gnus/mml2015.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/mml2015.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnfolder.el
--- a/lisp/gnus/nnfolder.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnfolder.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnheader.el
--- a/lisp/gnus/nnheader.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnheader.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnimap.el
--- a/lisp/gnus/nnimap.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnimap.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 @@
 			(* 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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnmail.el
--- a/lisp/gnus/nnmail.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnmail.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnmaildir.el
--- a/lisp/gnus/nnmaildir.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnmaildir.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nnrss.el
--- a/lisp/gnus/nnrss.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nnrss.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/nntp.el
--- a/lisp/gnus/nntp.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/nntp.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/rfc1843.el
--- a/lisp/gnus/rfc1843.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/rfc1843.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/sieve-manage.el
--- a/lisp/gnus/sieve-manage.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/sieve-manage.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/smime.el
--- a/lisp/gnus/smime.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/smime.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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 -r 3243e7055d49 -r 236342431786 lisp/gnus/spam.el
--- a/lisp/gnus/spam.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/gnus/spam.el	Mon Oct 11 23:29:33 2010 +0000
@@ -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))))
 
diff -r 3243e7055d49 -r 236342431786 lisp/mail/hashcash.el
--- a/lisp/mail/hashcash.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/mail/hashcash.el	Mon Oct 11 23:29:33 2010 +0000
@@ -48,6 +48,7 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
diff -r 3243e7055d49 -r 236342431786 lisp/net/imap.el
--- a/lisp/net/imap.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/net/imap.el	Mon Oct 11 23:29:33 2010 +0000
@@ -139,6 +139,7 @@
 
 (eval-when-compile (require 'cl))
 (eval-and-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls")
diff -r 3243e7055d49 -r 236342431786 lisp/pgg-parse.el
--- a/lisp/pgg-parse.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/pgg-parse.el	Mon Oct 11 23:29:33 2010 +0000
@@ -36,6 +36,7 @@
 ;;; Code:
 
 (eval-when-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (require 'cl))
 
diff -r 3243e7055d49 -r 236342431786 lisp/pgg.el
--- a/lisp/pgg.el	Mon Oct 11 22:27:28 2010 +0000
+++ b/lisp/pgg.el	Mon Oct 11 23:29:33 2010 +0000
@@ -36,6 +36,7 @@
 
 ;; Don't merge these two `eval-when-compile's.
 (eval-when-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (require 'cl))