[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#45029: 27.1.50; Regression: Yanking into externally modified file wi
From: |
Juri Linkov |
Subject: |
bug#45029: 27.1.50; Regression: Yanking into externally modified file with delete-selection-mode |
Date: |
Sat, 05 Dec 2020 21:42:10 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) |
> I'm guessing this is some unintended consequence of replacing
> read-char-choice in userlock.el with read-char-from-minibuffer.
>
> Juri, could you please look into this regression in Emacs 27? I'd
> like to try to fix this for 27.2.
Here is a brief trace that explains the cause of the problem:
1. C-y (yank) calls delete-selection-pre-hook from pre-command-hook
2. delete-selection-helper calls delete-active-region
3. this activates ask-user-about-supersession-threat on a modified file
4. it calls read-char-from-minibuffer ('this-command' is still 'yank')
5. read-char-from-minibuffer waits when user types 'y'
(bound to the command 'read-char-from-minibuffer-insert-char')
6. after typing 'y', read-char-from-minibuffer returns 'y', but
now 'this-command' is 'read-char-from-minibuffer-insert-char'
7. when delete-selection-pre-hook finishes, due to 'this-command'
'read-char-from-minibuffer-insert-char' is called again,
and this time operates on the buffer as if it's the minibuffer
It seems there is a fundamental problem when read-from-minibuffer
is used from pre-command-hook it modifies the value of this-command.
But I wonder why this problem doesn't occur in other places.
Maybe other places doesn't try to operate on the buffer as on
the minibuffer?
Anyway, here is a patch with two fixes:
1. Guards read-char-from-minibuffer-insert-char against inadvertent
operating on the non-minibuffer buffer;
2. Prevents read-char-from-minibuffer from changing the value of
'this-command' by read-from-minibuffer:
diff --git a/lisp/subr.el b/lisp/subr.el
index 4b75268c04..7f1450d4a2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2745,20 +2746,22 @@ read-char-from-minibuffer-insert-char
"Insert the character you type in the minibuffer and exit.
Discard all previous input before inserting and exiting the minibuffer."
(interactive)
- (delete-minibuffer-contents)
- (insert last-command-event)
- (exit-minibuffer))
+ (when (minibufferp)
+ (delete-minibuffer-contents)
+ (insert last-command-event)
+ (exit-minibuffer)))
(defun read-char-from-minibuffer-insert-other ()
"Handle inserting of a character other than allowed.
Display an error on trying to insert a disallowed character.
Also discard all previous input in the minibuffer."
(interactive)
- (delete-minibuffer-contents)
- (ding)
- (discard-input)
- (minibuffer-message "Wrong answer")
- (sit-for 2))
+ (when (minibufferp)
+ (delete-minibuffer-contents)
+ (ding)
+ (discard-input)
+ (minibuffer-message "Wrong answer")
+ (sit-for 2)))
(defvar empty-history)
@@ -2802,6 +2805,8 @@ read-char-from-minibuffer
map read-char-from-minibuffer-map-hash)
map))
read-char-from-minibuffer-map))
+ ;; Protect this-command when called from pre-command-hook (bug#45029)
+ (this-command this-command)
(result
(read-from-minibuffer prompt nil map nil
(or history 'empty-history)))
@@ -2856,28 +2861,31 @@ y-or-n-p-insert-y
"Insert the answer \"y\" and exit the minibuffer of `y-or-n-p'.
Discard all previous input before inserting and exiting the minibuffer."
(interactive)
- (delete-minibuffer-contents)
- (insert "y")
- (exit-minibuffer))
+ (when (minibufferp)
+ (delete-minibuffer-contents)
+ (insert "y")
+ (exit-minibuffer)))
(defun y-or-n-p-insert-n ()
"Insert the answer \"n\" and exit the minibuffer of `y-or-n-p'.
Discard all previous input before inserting and exiting the minibuffer."
(interactive)
- (delete-minibuffer-contents)
- (insert "n")
- (exit-minibuffer))
+ (when (minibufferp)
+ (delete-minibuffer-contents)
+ (insert "n")
+ (exit-minibuffer)))
(defun y-or-n-p-insert-other ()
"Handle inserting of other answers in the minibuffer of `y-or-n-p'.
Display an error on trying to insert a disallowed character.
Also discard all previous input in the minibuffer."
(interactive)
- (delete-minibuffer-contents)
- (ding)
- (discard-input)
- (minibuffer-message "Please answer y or n")
- (sit-for 2))
+ (when (minibufferp)
+ (delete-minibuffer-contents)
+ (ding)
+ (discard-input)
+ (minibuffer-message "Please answer y or n")
+ (sit-for 2)))
(defvar empty-history)
@@ -2955,6 +2963,8 @@ y-or-n-p
(let ((help-form msg)) ; lexically bound msg
(help-form-show)))))
map))
+ ;; Protect this-command when called from pre-command-hook
(bug#45029)
+ (this-command this-command)
(str (read-from-minibuffer
prompt nil keymap nil
(or y-or-n-p-history-variable 'empty-history))))