From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 3 Jun 2003 11:07:23 +0000 (+0000)
Subject: (dabbrev--goto-start-of-abbrev): Use minibuffer-prompt-end.
X-Git-Tag: ttn-vms-21-2-B4~9779
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b00214166057e71bc7a732a56395dd28f7d261f3;p=emacs.git

(dabbrev--goto-start-of-abbrev): Use minibuffer-prompt-end.
---

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index b31760ff654..202cb9edf74 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -613,16 +613,15 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
 (defun dabbrev--goto-start-of-abbrev ()
   ;; Move backwards over abbrev chars
   (save-match-data
-    (if (not (bobp))
-	(progn
-	  (forward-char -1)
-	  (while (and (looking-at dabbrev--abbrev-char-regexp)
-		      (not (bobp))
-		      (not (= (point) (field-beginning (point) nil
-						       (1- (point))))))
-	    (forward-char -1))
-	  (or (looking-at dabbrev--abbrev-char-regexp)
-	      (forward-char 1))))
+    (when (> (point) (minibuffer-prompt-end))
+      (forward-char -1)
+      (while (and (looking-at dabbrev--abbrev-char-regexp)
+		  (> (point) (minibuffer-prompt-end))
+		  (not (= (point) (field-beginning (point) nil
+						   (1- (point))))))
+	(forward-char -1))
+      (or (looking-at dabbrev--abbrev-char-regexp)
+	  (forward-char 1)))
     (and dabbrev-abbrev-skip-leading-regexp
 	 (while (looking-at dabbrev-abbrev-skip-leading-regexp)
 	   (forward-char 1)))))