diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-07-23 11:26:29 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-07-23 11:26:29 +0000 |
| commit | dfce923ac9b8e14bcb2937617775cc310745978a (patch) | |
| tree | 537a22971df96cc8152c0dc8ec38f733b7f8e054 /lisp | |
| parent | d7a7fda3cc130edb8bc10af96d322d263afbb44a (diff) | |
| download | emacs-dfce923ac9b8e14bcb2937617775cc310745978a.tar.gz emacs-dfce923ac9b8e14bcb2937617775cc310745978a.tar.bz2 emacs-dfce923ac9b8e14bcb2937617775cc310745978a.zip | |
nnir.el ("nnir"): Revert last change, that's premature to merge from Gnus master
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnir.el | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 957f38ca4c7..0ab56a87514 100644 --- 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 1d787035659..d1ca0213ed9 100644 --- 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) |