summaryrefslogtreecommitdiff
path: root/lisp/delsel.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/delsel.el')
-rw-r--r--lisp/delsel.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 982320340d8..93fdc6a8863 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -84,9 +84,12 @@ information on adapting behavior of commands in Delete Selection mode."
(defvar delsel--replace-text-or-position nil)
+;;;###autoload
(defun delete-active-region (&optional killp)
"Delete the active region.
-If KILLP in not-nil, the active region is killed instead of deleted."
+If KILLP is non-nil, or if called interactively with a prefix argument,
+the active region is killed instead of deleted."
+ (interactive "P")
(cond
(killp
;; Don't allow `kill-region' to change the value of `this-command'.
@@ -105,7 +108,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
"Repeat replacing text of highlighted region with typed text.
Search for the next stretch of text identical to the region last replaced
by typing text over it and replaces it with the same stretch of text.
-With ARG, repeat that many times. `C-u' means until end of buffer."
+With ARG, repeat that many times. `\\[universal-argument]' means until end of buffer."
(interactive "P")
(let ((old-text (and delete-selection-save-to-register
(get-register delete-selection-save-to-register)))
@@ -297,7 +300,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(interactive)
(if (and delete-selection-mode (region-active-p))
(setq deactivate-mark t)
- (abort-recursive-edit)))
+ (abort-minibuffers)))
(define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)