From 572da0fe1ea5261e730aa728dbc6c5c470ff0757 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sat, 21 Aug 1999 19:27:30 +0000 Subject: [PATCH] (next-history-element): Use minibuffer-prompt-end. Remove test for minibuffer-prompt-in-buffer. (kill-word): Don't move point into mini-buffer prompt. --- lisp/simple.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 456911c6c9a..a407994945e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -794,9 +794,7 @@ An uppercase letter in REGEXP makes the search case-sensitive." (let ((print-level nil)) (prin1-to-string elt)) elt)) - (if (boundp 'minibuffer-prompt-in-buffer) - (goto-char (minibuffer-prompt-width)) - (goto-char (point-min)))))) + (goto-char (minibuffer-prompt-end))))) (defun previous-history-element (n) "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." "Kill characters forward until encountering the end of a word. With argument, do this that many times." (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) "Kill characters backward until encountering the end of a word. -- 2.39.5