Commit 572da0fe authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(next-history-element): Use minibuffer-prompt-end.

Remove test for minibuffer-prompt-in-buffer.
(kill-word): Don't move point into mini-buffer prompt.
parent a4bda243
...@@ -794,9 +794,7 @@ An uppercase letter in REGEXP makes the search case-sensitive." ...@@ -794,9 +794,7 @@ An uppercase letter in REGEXP makes the search case-sensitive."
(let ((print-level nil)) (let ((print-level nil))
(prin1-to-string elt)) (prin1-to-string elt))
elt)) elt))
(if (boundp 'minibuffer-prompt-in-buffer) (goto-char (minibuffer-prompt-end)))))
(goto-char (minibuffer-prompt-width))
(goto-char (point-min))))))
(defun previous-history-element (n) (defun previous-history-element (n)
"Inserts the previous element of the minibuffer history into the minibuffer." "Inserts the previous element of the minibuffer history into the minibuffer."
...@@ -2849,7 +2847,12 @@ In programs, it is faster to call `forward-word' with negative arg." ...@@ -2849,7 +2847,12 @@ In programs, it is faster to call `forward-word' with negative arg."
"Kill characters forward until encountering the end of a word. "Kill characters forward until encountering the end of a word.
With argument, do this that many times." With argument, do this that many times."
(interactive "*p") (interactive "*p")
(kill-region (point) (progn (forward-word arg) (point)))) (let ((start (point))
(end (progn (forward-word arg) (point)))
(prompt-end (minibuffer-prompt-end)))
(when (< end prompt-end)
(goto-char (setq end prompt-end)))
(kill-region start end)))
(defun backward-kill-word (arg) (defun backward-kill-word (arg)
"Kill characters backward until encountering the end of a word. "Kill characters backward until encountering the end of a word.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment