[Emacs-diffs] /srv/bzr/emacs/trunk r101912: nnimap.el (gnutls-negotiate): Silence the byte compiler.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101912
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-10-11 23:29:33 +0000
message:
  nnimap.el (gnutls-negotiate): Silence the byte compiler.
  *.el: Fix comment for declare-function.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-cache.el
  lisp/gnus/gnus-fun.el
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-picon.el
  lisp/gnus/gnus-spec.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/gnus-util.el
  lisp/gnus/gnus.el
  lisp/gnus/mail-source.el
  lisp/gnus/message.el
  lisp/gnus/mm-bodies.el
  lisp/gnus/mm-decode.el
  lisp/gnus/mm-extern.el
  lisp/gnus/mm-util.el
  lisp/gnus/mm-view.el
  lisp/gnus/mml-smime.el
  lisp/gnus/mml.el
  lisp/gnus/mml1991.el
  lisp/gnus/mml2015.el
  lisp/gnus/nnfolder.el
  lisp/gnus/nnheader.el
  lisp/gnus/nnimap.el
  lisp/gnus/nnmail.el
  lisp/gnus/nnmaildir.el
  lisp/gnus/nnrss.el
  lisp/gnus/nntp.el
  lisp/gnus/rfc1843.el
  lisp/gnus/sieve-manage.el
  lisp/gnus/smime.el
  lisp/gnus/spam.el
  lisp/mail/hashcash.el
  lisp/net/imap.el
  lisp/pgg-parse.el
  lisp/pgg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-11 04:49:59 +0000
+++ b/lisp/ChangeLog    2010-10-11 23:29:33 +0000
@@ -1,3 +1,8 @@
+2010-10-11  Katsumi Yamaoka  <address@hidden>
+
+       * mail/hashcash.el, net/imap.el, pgg-parse.el, pgg.el:
+       Fix comment for declare-function.
+
 2010-10-11  Chong Yidong  <address@hidden>
 
        * custom.el (custom-fix-face-spec): New function; code moved from

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-11 22:27:28 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-11 23:29:33 +0000
@@ -1,3 +1,17 @@
+2010-10-11  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nnimap.el (nnimap-request-rename-group): Select group read-only

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-10-08 02:12:56 +0000
+++ b/lisp/gnus/gnus-art.el     2010-10-11 23:29:33 +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

=== modified file 'lisp/gnus/gnus-cache.el'
--- a/lisp/gnus/gnus-cache.el   2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus-cache.el   2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/gnus-fun.el'
--- a/lisp/gnus/gnus-fun.el     2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/gnus-fun.el     2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2010-10-08 23:55:33 +0000
+++ b/lisp/gnus/gnus-group.el   2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/gnus-picon.el'
--- a/lisp/gnus/gnus-picon.el   2010-09-26 23:01:31 +0000
+++ b/lisp/gnus/gnus-picon.el   2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/gnus-spec.el'
--- a/lisp/gnus/gnus-spec.el    2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/gnus-spec.el    2010-10-11 23:29:33 +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))

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-10-10 22:48:40 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-10-11 23:29:33 +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

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2010-10-08 23:55:33 +0000
+++ b/lisp/gnus/gnus-util.el    2010-10-11 23:29:33 +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

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-10-10 00:15:21 +0000
+++ b/lisp/gnus/gnus.el 2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mail-source.el'
--- a/lisp/gnus/mail-source.el  2010-10-01 00:25:50 +0000
+++ b/lisp/gnus/mail-source.el  2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-10-06 12:38:45 +0000
+++ b/lisp/gnus/message.el      2010-10-11 23:29:33 +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

=== modified file 'lisp/gnus/mm-bodies.el'
--- a/lisp/gnus/mm-bodies.el    2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/mm-bodies.el    2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2010-10-08 23:55:33 +0000
+++ b/lisp/gnus/mm-decode.el    2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mm-extern.el'
--- a/lisp/gnus/mm-extern.el    2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/mm-extern.el    2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/mm-util.el      2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mm-view.el'
--- a/lisp/gnus/mm-view.el      2010-10-04 00:17:16 +0000
+++ b/lisp/gnus/mm-view.el      2010-10-11 23:29:33 +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))

=== modified file 'lisp/gnus/mml-smime.el'
--- a/lisp/gnus/mml-smime.el    2010-10-04 22:26:51 +0000
+++ b/lisp/gnus/mml-smime.el    2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el  2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/mml.el  2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/mml1991.el'
--- a/lisp/gnus/mml1991.el      2010-09-26 04:03:19 +0000
+++ b/lisp/gnus/mml1991.el      2010-10-11 23:29:33 +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")

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-09-28 12:35:18 +0000
+++ b/lisp/gnus/mml2015.el      2010-10-11 23:29:33 +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")

=== modified file 'lisp/gnus/nnfolder.el'
--- a/lisp/gnus/nnfolder.el     2010-09-23 23:14:02 +0000
+++ b/lisp/gnus/nnfolder.el     2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/nnheader.el'
--- a/lisp/gnus/nnheader.el     2010-09-26 04:03:19 +0000
+++ b/lisp/gnus/nnheader.el     2010-10-11 23:29:33 +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))

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-10-11 22:27:28 +0000
+++ b/lisp/gnus/nnimap.el       2010-10-11 23:29:33 +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)

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2010-10-10 00:15:21 +0000
+++ b/lisp/gnus/nnmail.el       2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/nnmaildir.el'
--- a/lisp/gnus/nnmaildir.el    2010-09-23 23:14:02 +0000
+++ b/lisp/gnus/nnmaildir.el    2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/nnrss.el'
--- a/lisp/gnus/nnrss.el        2010-10-06 12:38:45 +0000
+++ b/lisp/gnus/nnrss.el        2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2010-10-01 00:25:50 +0000
+++ b/lisp/gnus/nntp.el 2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/rfc1843.el'
--- a/lisp/gnus/rfc1843.el      2010-09-25 13:28:07 +0000
+++ b/lisp/gnus/rfc1843.el      2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2010-10-11 22:27:28 +0000
+++ b/lisp/gnus/sieve-manage.el 2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/gnus/smime.el'
--- a/lisp/gnus/smime.el        2010-10-03 02:09:53 +0000
+++ b/lisp/gnus/smime.el        2010-10-11 23:29:33 +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)

=== modified file 'lisp/gnus/spam.el'
--- a/lisp/gnus/spam.el 2010-10-10 00:15:21 +0000
+++ b/lisp/gnus/spam.el 2010-10-11 23:29:33 +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))))
 

=== modified file 'lisp/mail/hashcash.el'
--- a/lisp/mail/hashcash.el     2010-09-07 00:04:11 +0000
+++ b/lisp/mail/hashcash.el     2010-10-11 23:29:33 +0000
@@ -48,6 +48,7 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 

=== modified file 'lisp/net/imap.el'
--- a/lisp/net/imap.el  2010-09-14 23:14:44 +0000
+++ b/lisp/net/imap.el  2010-10-11 23:29:33 +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")

=== modified file 'lisp/pgg-parse.el'
--- a/lisp/pgg-parse.el 2010-09-02 00:55:51 +0000
+++ b/lisp/pgg-parse.el 2010-10-11 23:29:33 +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))
 

=== modified file 'lisp/pgg.el'
--- a/lisp/pgg.el       2010-09-29 01:09:50 +0000
+++ b/lisp/pgg.el       2010-10-11 23:29:33 +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))