[Emacs-diffs] /srv/bzr/emacs/trunk r100229: * minibuffer.el (completion-pcm--pattern->regex): Fix last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 100229
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-11 09:24:49 -0400
message:
  * minibuffer.el (completion-pcm--pattern->regex): Fix last change.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-11 02:04:13 +0000
+++ b/lisp/ChangeLog    2010-05-11 13:24:49 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion-pcm--pattern->regex):
+       Fix last change (bug#6160).
+
 2010-05-10  Juri Linkov  <address@hidden>
 
        Remove nodes visited during Isearch from the Info history.
@@ -11,8 +16,8 @@
 2010-05-10  Michael Albinus  <address@hidden>
 
        * 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 <address@hidden>.
+       format string, in order to work around a bug in pdksh.
+       Reported by Gilles Pion <address@hidden>.
        (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.

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2010-05-09 22:39:36 +0000
+++ b/lisp/minibuffer.el        2010-05-11 13:24:49 +0000
@@ -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.