[Emacs-diffs] /srv/bzr/emacs/trunk r112679: Silence some gnus compilation warnings

[Glenn Morris]

------------------------------------------------------------
revno: 112679
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-22 22:05:27 -0700
message:
  Silence some gnus compilation warnings
  
  * gnus/mm-decode.el: No need to load term when compiling.
  (term-mode, term-char-mode): Declare.
  
  * gnus/mm-util.el: No need to load jka-compr when compiling.
  (jka-compr-acceptable-retval-list, jka-compr-make-temp-name): Declare.
  
  * gnus/nnmaildir.el: Require is automatically eval-and-compile.
  (nnmail): Require at run-time too.
  
  * gnus/registry.el (registry-size): Move definition before use.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el
  lisp/gnus/mm-util.el
  lisp/gnus/nnmaildir.el
  lisp/gnus/registry.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-05-22 13:18:40 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-23 05:05:27 +0000
@@ -1,3 +1,16 @@
+2013-05-23  Glenn Morris  <address@hidden>
+
+       * mm-decode.el: No need to load term when compiling.
+       (term-mode, term-char-mode): Declare.
+
+       * mm-util.el: No need to load jka-compr when compiling.
+       (jka-compr-acceptable-retval-list, jka-compr-make-temp-name): Declare.
+
+       * nnmaildir.el: Require is automatically eval-and-compile.
+       (nnmail): Require at run-time too.
+
+       * registry.el (registry-size): Move definition before use.
+
 2013-05-22  Daiki Ueno  <address@hidden>
 
        * mml2015.el (mml2015-epg-sign): Make sure to insert newline after the

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2013-03-05 17:13:01 +0000
+++ b/lisp/gnus/mm-decode.el    2013-05-23 05:05:27 +0000
@@ -29,8 +29,7 @@
 
 (require 'mail-parse)
 (require 'mm-bodies)
-(eval-when-compile (require 'cl)
-                  (require 'term))
+(eval-when-compile (require 'cl))
 
 (autoload 'gnus-map-function "gnus-util")
 (autoload 'gnus-replace-in-string "gnus-util")
@@ -813,6 +812,8 @@
 
 (declare-function gnus-configure-windows "gnus-win" (setting &optional force))
 (defvar mailcap-mime-extensions)       ; mailcap-mime-info autoloads
+(declare-function term-mode "term" ())
+(declare-function term-char-mode "term" ())
 
 (defun mm-display-external (handle method)
   "Display HANDLE using METHOD."

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/mm-util.el      2013-05-23 05:05:27 +0000
@@ -1508,8 +1508,8 @@
                      (fboundp 'coding-system-to-mime-charset)))
             (coding-system-to-mime-charset coding-system)))))
 
-(eval-when-compile
-  (require 'jka-compr))
+(defvar jka-compr-acceptable-retval-list)
+(declare-function jka-compr-make-temp-name "jka-compr" (&optional local))
 
 (defun mm-decompress-buffer (filename &optional inplace force)
   "Decompress buffer's contents, depending on jka-compr.

=== modified file 'lisp/gnus/nnmaildir.el'
--- a/lisp/gnus/nnmaildir.el    2012-09-06 02:20:21 +0000
+++ b/lisp/gnus/nnmaildir.el    2013-05-23 05:05:27 +0000
@@ -63,17 +63,17 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
-(eval-and-compile
-  (require 'nnheader)
-  (require 'gnus)
-  (require 'gnus-util)
-  (require 'gnus-range)
-  (require 'gnus-start)
-  (require 'gnus-int)
-  (require 'message))
+(require 'nnheader)
+(require 'gnus)
+(require 'gnus-util)
+(require 'gnus-range)
+(require 'gnus-start)
+(require 'gnus-int)
+(require 'message)
+(require 'nnmail)
+
 (eval-when-compile
-  (require 'cl)
-  (require 'nnmail))
+  (require 'cl))
 
 (defconst nnmaildir-version "Gnus")
 

=== modified file 'lisp/gnus/registry.el'
--- a/lisp/gnus/registry.el     2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/registry.el     2013-05-23 05:05:27 +0000
@@ -249,6 +249,11 @@
          (remhash key data)))
       keys))
 
+  (defmethod registry-size ((db registry-db))
+    "Returns the size of the registry-db object THIS.
+This is the key count of the :data slot."
+    (hash-table-count (oref db :data)))
+
   (defmethod registry-full ((db registry-db))
     "Checks if registry-db THIS is full."
     (>= (registry-size db)
@@ -297,11 +302,6 @@
                 (registry-lookup-secondary-value db tr val value-keys))))
           (oref db :data))))))
 
-  (defmethod registry-size ((db registry-db))
-    "Returns the size of the registry-db object THIS.
-This is the key count of the :data slot."
-    (hash-table-count (oref db :data)))
-
   (defmethod registry-prune ((db registry-db) &optional sortfun)
     "Prunes the registry-db object THIS.
 Removes only entries without the :precious keys if it can,