2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87b11285851..8c3883808f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-pcm--pattern->regex):
+        Fix last change (bug#6160).
+
 2010-05-10  Juri Linkov  <juri@jurta.org>
 
         Remove nodes visited during Isearch from the Info history.
@@ -11,8 +16,8 @@
 2010-05-10  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-do-file-attributes-with-stat): Add space in
-        format string, in order to work around a bug in pdksh.  Reported
-        by Gilles Pion <gpion@lfdj.com>.
+        format string, in order to work around a bug in pdksh.
+        Reported by Gilles Pion <gpion@lfdj.com>.
         (tramp-handle-verify-visited-file-modtime): Do not send a command
         when the connection is not established.
         (tramp-handle-set-file-times): Simplify the check for utc.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 869ce937b66..2f27cd0d40e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1835,8 +1835,8 @@ or a symbol chosen among `any', `star', `point', `prefix'."
                   (lambda (x)
                     (cond
                      ((stringp x) (regexp-quote x))
-                     ((if (consp group) (memq x group) group)
-                      "\\(.*?\\)" ".*?")))
+                     ((if (consp group) (memq x group) group) "\\(.*?\\)")
+                     (t ".*?")))
                   pattern
                   ""))))
     ;; Avoid pathological backtracking.