3 files changed, 11 insertions, 7 deletions

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index a0be0ca8ba4..c0464e2c53f 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -430,8 +430,12 @@ MODE can be \"login\" or \"password\"."
           (and found (return found)))
 
         ;; We haven't found something, so we will create it interactively.
-        (when (and (not found) choices create-missing)
-          (setq found (apply 'auth-source-create mode (car choices) search)))
+        (when (and (not found) create-missing)
+          (setq found (apply 'auth-source-create
+                             mode (if choices
+                                      (car choices)
+                                    (car auth-sources))
+                             search)))
 
         ;; Cache the result.
         (when found
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 195c7249778..2f8abe61ee9 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -451,8 +451,10 @@ and non-`vertical', do both horizontal and vertical recentering."
                  (integer :tag "height")
                  (sexp :menu-tag "both" t)))
 
-(defvar gnus-auto-center-group t
-  "*If non-nil, always center the group buffer.")
+(defcustom gnus-auto-center-group t
+  "If non-nil, always center the group buffer."
+  :group 'gnus-summary-maneuvering
+  :type 'boolean)
 
 (defcustom gnus-show-all-headers nil
   "*If non-nil, don't hide any headers."
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 0c01d599cfc..ee504597535 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3862,9 +3862,7 @@ The function `gnus-group-find-parameter' will do that for you."
               ;; Expand if necessary.
               (if (and (stringp result) (string-match "\\\\[0-9&]" result))
                   (setq result (gnus-expand-group-parameter (car head)
-                                                            result group)))
-              ;; Exit the loop early.
-              (setq tail nil))))
+                                                            result group))))))
         ;; Done.
         result))))