From: Miha Rihtaršič <miha@kamnitnik.top>
Date: Wed, 4 Aug 2021 07:15:25 +0000 (+0200)
Subject: Use `abort-minibuffers' in delsel
X-Git-Tag: emacs-28.0.90~1591^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4f3e6cabafb3e04292a650874d977c692dbad22;p=emacs.git

Use `abort-minibuffers' in delsel

* lisp/delsel.el (minibuffer-keyboard-quit): Use
`abort-minibuffers' (bug#49821).

Previously, C-g was bound to abort-recursive-edit, now it is bound to
abort-minibuffers.  However, after requiring delsel, it gets bound to
minibuffer-keyboard-quit, which still uses abort-recursive-edit.  Use
the new function instead.
---

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 3c99dd2344c..93fdc6a8863 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -300,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)