(dabbrev--goto-start-of-abbrev): Put a limit on field-beginning search.

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 92191a926c3..55b080ee0b1 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -599,7 +599,9 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
         (progn
           (forward-char -1)
           (while (and (looking-at dabbrev--abbrev-char-regexp)
-                      (not (= (point) (field-beginning (point)))))
+                      (not (bobp))
+                      (not (= (point) (field-beginning (point) nil
+                                                       (1- (point))))))
             (forward-char -1))
           (or (looking-at dabbrev--abbrev-char-regexp)
               (forward-char 1))))