From: Miles Bader <miles@gnu.org>
Date: Mon, 7 Aug 2000 14:57:22 +0000 (+0000)
Subject: (try-expand-line, try-expand-line-all-buffers): Only use comint-prompt-regexp
X-Git-Tag: emacs-pretest-21.0.90~2448
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69e773247b4fac5a7430f8446fe280b36850fb7a;p=emacs.git

(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 747b5d6a61d..830f6480322 100644
--- 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))