Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1411

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 01cbd7f2a59..908c3bc33a7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-08  David Engster  <dengste@eml.cc>
+
+        * nnmairix.el (nnmairix-create-server-and-default-group): Require match
+        in completing-read for back end server.
+
 2008-09-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * message.el (message-confirm-send): New variable to confirm sending a
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 6917b7739db..32ca980fc67 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -877,7 +877,7 @@ All necessary information will be queried from the user."
   (interactive)
   (let* ((name (read-string "Name of the mairix server: "))
         (server (completing-read "Back end server (TAB for completion): "
-                                 (nnmairix-get-valid-servers)))
+                                 (nnmairix-get-valid-servers) nil 1))
         (mairix (read-string "Command to call mairix: " "mairix"))
         (defaultgroup (read-string "Default search group: "))
         (backend (symbol-name (car (gnus-server-to-method server))))