(try-expand-line, try-expand-line-all-buffers): Only use comint-prompt-regexp

  if comint-use-prompt-regexp-instead-of-fields is non-nil.

diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 747b5d6a61da3c1909a66c072900715d42edd2f0..830f6480322a8da0168823afdbd70ca633422d62 100644 (file)
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -634,6 +634,7 @@ for subsequent calls (for further possible completions of the same
 string).  It returns t if a new completion is found, nil otherwise."
   (let ((expansion ())
        (strip-prompt (and (get-buffer-process (current-buffer))
+                          comint-use-prompt-regexp-instead-of-fields
                           comint-prompt-regexp)))
     (if (not old)
        (progn
@@ -680,6 +681,7 @@ for subsequent calls (for further possible completions of the same
 string).  It returns t if a new completion is found, nil otherwise."
   (let ((expansion ())
        (strip-prompt (and (get-buffer-process (current-buffer))
+                          comint-use-prompt-regexp-instead-of-fields
                           comint-prompt-regexp))
        (buf (current-buffer))
        (orig-case-fold-search case-fold-search))
@@ -706,6 +708,7 @@ string).  It returns t if a new completion is found, nil otherwise."
                      (widen))
                  (goto-char he-search-loc)
                  (setq strip-prompt (and (get-buffer-process (current-buffer))
+                                         comint-use-prompt-regexp-instead-of-fields
                                          comint-prompt-regexp))
                  (setq expansion 
                        (let ((case-fold-search orig-case-fold-search))