summaryrefslogtreecommitdiff
path: root/lisp/delsel.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-10-26 15:14:53 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2020-10-26 19:15:36 +0100
commit9e8fb4a7cb7d2e460557dfc88d82b289df809a27 (patch)
tree5e292892c3e3c35fabd224b64dc27c2e34333cb7 /lisp/delsel.el
parentd23e483cfb51bc25193f5725bbc67b92f9dc200f (diff)
downloademacs-9e8fb4a7cb7d2e460557dfc88d82b289df809a27.tar.gz
Make delete-selection-helper more resilient
* lisp/delsel.el (delete-selection-helper): Don't bug out on `C-g' (bug#40357).
Diffstat (limited to 'lisp/delsel.el')
-rw-r--r--lisp/delsel.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 16886dfdb12..df2adc7aeba 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -217,6 +217,10 @@ With ARG, repeat that many times. `C-u' means until end of buffer."
(self-insert-command
(prefix-numeric-value current-prefix-arg))
(setq this-command 'ignore)))))
+ ;; If the user has quit here (for instance, if the user is
+ ;; presented with a "changed on disk; really edit the buffer?"
+ ;; prompt, but hit `C-g'), just ding.
+ (quit (ding))
;; If ask-user-about-supersession-threat signals an error,
;; stop safe_run_hooks from clearing out pre-command-hook.
(file-supersession (message "%s" (cadr data)) (ding))