procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

* lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)

Browse source 
* lisp/vc/ediff-util.el (ediff-toggle-read-only, ediff-quit):
Set this-command to the same command after using y-or-n-p
that doesn't guarantee to keep this-command unchanged
to check it later for some contrived logic.
This commit is contained in:
Juri Linkov 2019-11-18 23:53:11 +02:00
parent ed52618e70
commit 3ba98fb1d7
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/ediff-util.el
View file

@ -1038,6 +1038,7 @@ of the current buffer."
(format
"File %s is under version control. Check it out? "
(ediff-abbreviate-file-name file))))
(setq this-command 'ediff-toggle-read-only) ; bug#38219
;; if we checked the file out, we should also change the
;; original state of buffer-read-only to nil. If we don't
;; do this, the mode line will show %%, since the file was
@ -2379,6 +2380,7 @@ temporarily reverses the meaning of this variable."
" & show containing session group" "")))
(progn
(message "")
(setq this-command 'ediff-quit) ; bug#38219
(set-buffer ctl-buf)
(ediff-really-quit reverse-default-keep-variants))
(select-frame ctl-frm)