master 9e8fb4a 2/4: Make delete-selection-helper more resilient

[Lars Ingebrigtsen]

branch: master
commit 9e8fb4a7cb7d2e460557dfc88d82b289df809a27
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Make delete-selection-helper more resilient
    
    * lisp/delsel.el (delete-selection-helper): Don't bug out on `C-g'
    (bug#40357).
---
 lisp/delsel.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 16886df..df2adc7 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))