(completion-table-with-terminator): Allow to specify the terminator-regexp.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba788adc109..5e77cb43175 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * minibuffer.el (completion-table-with-terminator): Allow to specify
+        the terminator-regexp.
+
         * simple.el (switch-to-completions): Look for *Completions* in other
         frames as well.
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 2024a5bd7d1..cd606eb33b4 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -200,16 +200,24 @@ This is meant to be called in a curried way by first passing TERMINATOR
 and TABLE only (via `apply-partially').
 TABLE is a completion table, and TERMINATOR is a string appended to TABLE's
 completion if it is complete.  TERMINATOR is also used to determine the
-completion suffix's boundary."
+completion suffix's boundary.
+TERMINATOR can also be a cons cell (TERMINATOR . TERMINATOR-REGEXP)
+in which case TERMINATOR-REGEXP is a regular expression whose submatch
+number 1 should match TERMINATOR.  This is used when there is a need to
+distinguish occurrences of the TERMINATOR strings which are really terminators
+from others (e.g. escaped)."
   (cond
    ((eq (car-safe action) 'boundaries)
     (let* ((suffix (cdr action))
            (bounds (completion-boundaries string table pred suffix))
-           (max (string-match (regexp-quote terminator) suffix)))
+           (terminator-regexp (if (consp terminator)
+                                  (cdr terminator) (regexp-quote terminator)))
+           (max (string-match terminator-regexp suffix)))
       (list* 'boundaries (car bounds)
              (min (cdr bounds) (or max (length suffix))))))
    ((eq action nil)
     (let ((comp (try-completion string table pred)))
+      (if (consp terminator) (setq terminator (car terminator)))
       (if (eq comp t)
           (concat string terminator)
         (if (and (stringp comp)