diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-11 09:24:49 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-11 09:24:49 -0400 |
| commit | 8a67c70efbc12bf01237046b7d18c436a5cc82ac (patch) | |
| tree | 4c3030cde6a69a525f934f5a08336e0105a73fe9 /lisp | |
| parent | 4767419a31105c2a5077ca35263507c8e5991d8d (diff) | |
| download | emacs-8a67c70efbc12bf01237046b7d18c436a5cc82ac.tar.gz emacs-8a67c70efbc12bf01237046b7d18c436a5cc82ac.tar.bz2 emacs-8a67c70efbc12bf01237046b7d18c436a5cc82ac.zip | |
* minibuffer.el (completion-pcm--pattern->regex): Fix last change.
Fixes: debbugs:6160
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 4 |
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. |