2 files changed, 13 insertions, 8 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ce40019487a..9305114b634 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus.el (gnus-method-ephemeral-p): Move after declaration of defsubst
+        `gnus-sloppily-equal-method-parameters' to avoid a warning.
+
 2012-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-msg.el (gnus-msg-mail): Use `message-mail' if Gnus isn't
@@ -1489,7 +1494,7 @@
 
 2011-06-21  Andrew Cohen  <cohen@andy.bu.edu>
 
-        * nnimap.el (nnimap-find-article-by-message-id): return nil when no
+        * nnimap.el (nnimap-find-article-by-message-id): Return nil when no
         article found.
 
 2011-06-18  Teodor Zlatanov  <tzz@lifelogs.com>
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 76003f4eec2..cc4f2eb1e7a 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3581,13 +3581,6 @@ that that variable is buffer-local to the summary buffers."
                                             gnus-valid-select-methods)))
                  (equal (nth 1 m1) (nth 1 m2)))))))
 
-(defun gnus-method-ephemeral-p (method)
-  (let ((equal nil))
-    (dolist (ephemeral gnus-ephemeral-servers)
-      (when (gnus-sloppily-equal-method-parameters method ephemeral)
-        (setq equal t)))
-    equal))
-
 (defsubst gnus-sloppily-equal-method-parameters (m1 m2)
   ;; Check parameters for sloppy equality.
   (let ((p1 (copy-sequence (cddr m1)))
@@ -3616,6 +3609,13 @@ that that variable is buffer-local to the summary buffers."
       ;; If p2 now is empty, they were equal.
       (null p2))))
 
+(defun gnus-method-ephemeral-p (method)
+  (let ((equal nil))
+    (dolist (ephemeral gnus-ephemeral-servers)
+      (when (gnus-sloppily-equal-method-parameters method ephemeral)
+        (setq equal t)))
+    equal))
+
 (defun gnus-methods-sloppily-equal (m1 m2)
   ;; Same method.
   (or