changeset 108486:7b8ec1ad0223

* minibuffer.el (completion-pcm--pattern->regex): Fix last change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 11 May 2010 09:24:49 -0400
parents 0eeae12a33a9
children 57fe80b13f7a
files lisp/ChangeLog lisp/minibuffer.el
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue May 11 06:05:19 2010 +0000
+++ b/lisp/ChangeLog	Tue May 11 09:24:49 2010 -0400
@@ -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.
--- a/lisp/minibuffer.el	Tue May 11 06:05:19 2010 +0000
+++ b/lisp/minibuffer.el	Tue May 11 09:24:49 2010 -0400
@@ -1835,8 +1835,8 @@
                   (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.