diff options
author | Richard M. Stallman <rms@gnu.org> | 2003-06-03 11:07:23 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 2003-06-03 11:07:23 +0000 |
commit | b00214166057e71bc7a732a56395dd28f7d261f3 (patch) | |
tree | 6bf6561f36bfa1cb83bb89223a61144b0a6e7751 /lisp/dabbrev.el | |
parent | 3fceac6afa7149afa52f6a26a0c2d5e9d9a7eb91 (diff) | |
download | emacs-b00214166057e71bc7a732a56395dd28f7d261f3.tar.gz |
(dabbrev--goto-start-of-abbrev): Use minibuffer-prompt-end.
Diffstat (limited to 'lisp/dabbrev.el')
-rw-r--r-- | lisp/dabbrev.el | 19 |
1 files changed, 9 insertions, 10 deletions
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))))) |