nnir.el ("nnir"): Revert last change, that's premature to merge from Gnus master

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 957f38ca4c701133ab440bacdfecb354cdc19f27..0ab56a8751489d03ea66be7d4f0c723df7a79818 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnir.el ("nnir"): Revert last change, that's premature to merge from
+       Gnus master.
+
 2012-07-22  Andrew Cohen  <cohen@bu.edu>
 
        * nnir.el ("nnir"): Add 'virtual ability to nnir backend.

diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 1d787035659541b1438791a9a55f3b048bc336f9..d1ca0213ed968c5280824f97cb66971f4f1ea5da 100644 (file)
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -288,7 +288,7 @@ is `(valuefunc member)'."
 (eval-when-compile
   (autoload 'nnimap-buffer "nnimap")
   (autoload 'nnimap-command "nnimap")
-  (autoload 'nnimap-change-group "nnimap")
+  (autoload 'nnimap-possibly-change-group "nnimap")
   (autoload 'nnimap-make-thread-query "nnimap")
   (autoload 'gnus-registry-action "gnus-registry"))
 
@@ -298,7 +298,7 @@ is `(valuefunc member)'."
 (defvoo nnir-address nil
   "The address of the nnir server.")
 
-(gnus-declare-backend "nnir" 'mail 'virtual)
+(gnus-declare-backend "nnir" 'mail)
 
 
 ;;; User Customizable Variables:
@@ -854,7 +854,7 @@ details on the language and supported extensions."
          (lambda (group)
            (let (artlist)
              (condition-case ()
-                 (when (nnimap-change-group
+                 (when (nnimap-possibly-change-group
                         (gnus-group-short-name group) server)
                    (with-current-buffer (nnimap-buffer)
                      (message "Searching %s..." group)