/srv/bzr/emacs/trunk r109193: nnir.el ("nnir"): Revert last change, that's premature to merge from Gnus master

------------------------------------------------------------
revno: 109193
committer: Katsumi Yamaoka <yamaoka <at> jpl.org>
branch nick: trunk
timestamp: Mon 2012-07-23 11:26:29 +0000
message:
  nnir.el ("nnir"): Revert last change, that's premature to merge from Gnus master
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog	2012-07-23 11:10:23 +0000
+++ b/lisp/gnus/ChangeLog	2012-07-23 11:26:29 +0000
 <at>  <at>  -1,3 +1,8  <at>  <at> 
+2012-07-23  Katsumi Yamaoka  <yamaoka <at> jpl.org>
+
+	* nnir.el ("nnir"): Revert last change, that's premature to merge from
+	Gnus master.
+
 2012-07-22  Andrew Cohen  <cohen <at> bu.edu>

 	* nnir.el ("nnir"): Add 'virtual ability to nnir backend.

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el	2012-07-23 11:10:23 +0000
+++ b/lisp/gnus/nnir.el	2012-07-23 11:26:29 +0000
 <at>  <at>  -288,7 +288,7  <at>  <at> 
 (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"))

 <at>  <at>  -298,7 +298,7  <at>  <at> 
 (defvoo nnir-address nil
   "The address of the nnir server.")

-(gnus-declare-backend "nnir" 'mail 'virtual)
+(gnus-declare-backend "nnir" 'mail)

 
 ;;; User Customizable Variables:
 <at>  <at>  -854,7 +854,7  <at>  <at> 
 	  (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)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog	2012-07-23 11:10:23 +0000
+++ b/lisp/gnus/ChangeLog	2012-07-23 11:26:29 +0000
 <at>  <at>  -1,3 +1,8  <at>  <at> 
+2012-07-23  Katsumi Yamaoka  <yamaoka <at> jpl.org>
+
+	* nnir.el ("nnir"): Revert last change, that's premature to merge from
+	Gnus master.
+
 2012-07-22  Andrew Cohen  <cohen <at> bu.edu>

 	* nnir.el ("nnir"): Add 'virtual ability to nnir backend.

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el	2012-07-23 11:10:23 +0000
+++ b/lisp/gnus/nnir.el	2012-07-23 11:26:29 +0000
 <at>  <at>  -288,7 +288,7  <at>  <at> 
 (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"))

 <at>  <at>  -298,7 +298,7  <at>  <at> 
 (defvoo nnir-address nil
   "The address of the nnir server.")

-(gnus-declare-backend "nnir" 'mail 'virtual)
+(gnus-declare-backend "nnir" 'mail)

 
 ;;; User Customizable Variables:
 <at>  <at>  -854,7 +854,7  <at>  <at> 
 	  (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)