(eww-convert-widgets): Fix last patch.

[gnus] / lisp / nnir.el

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 882e863..22dee30 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -326,7 +326,7 @@ with three items unique to nnir summary buffers:
 
 If nil this will use `gnus-summary-line-format'."
   :version "24.1"
-  :type '(string)
+  :type '(choice (const :tag "gnus-summary-line-format" nil) string)
   :group 'nnir)
 
 (defcustom nnir-retrieve-headers-override-function nil
@@ -338,7 +338,7 @@ retrieved header format.
 If this variable is nil, or if the provided function returns nil for a search
 result, `gnus-retrieve-headers' will be called instead."
   :version "24.1"
-  :type '(function)
+  :type '(choice (const :tag "gnus-retrieve-headers" nil) function)
   :group 'nnir)
 
 (defcustom nnir-imap-default-search-key "whole message"
@@ -837,6 +837,7 @@ skips all prompting."
     (gnus-request-update-mark artgroup artnumber mark)))
 
 (deffoo nnir-request-set-mark (group actions &optional server)
+  (nnir-possibly-change-group group server)
   (let (mlist)
     (dolist (action actions)
       (destructuring-bind (range action marks) action
@@ -853,7 +854,7 @@ skips all prompting."
 
 
 (deffoo nnir-request-update-info (group info &optional server)
-  (nnir-possibly-change-group group)
+  (nnir-possibly-change-group group server)
   ;; clear out all existing marks.
   (gnus-info-set-marks info nil)
   (gnus-info-set-read info nil)
@@ -891,6 +892,7 @@ skips all prompting."
 
 
 (deffoo nnir-close-group (group &optional server)
+  (nnir-possibly-change-group group server)
   (let ((pgroup (gnus-group-guess-full-name-from-command-method group)))
     (when (and nnir-artlist (not (gnus-ephemeral-group-p pgroup)))
       (gnus-group-set-parameter  pgroup 'nnir-artlist nnir-artlist))