diff options
| author | Juri Linkov <juri@linkov.net> | 2019-11-18 23:53:11 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-11-18 23:53:11 +0200 |
| commit | 3ba98fb1d735140cb3c6cd5f74674a65d7a45015 (patch) | |
| tree | 9a95d25400e9e364f1f2963a92c5a4d55c407ab7 /lisp/vc/ediff-util.el | |
| parent | ed52618e707682e812002c98b99efe4baf43e1ca (diff) | |
| download | emacs-3ba98fb1d735140cb3c6cd5f74674a65d7a45015.tar.gz emacs-3ba98fb1d735140cb3c6cd5f74674a65d7a45015.tar.bz2 emacs-3ba98fb1d735140cb3c6cd5f74674a65d7a45015.zip | |
* lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)
* 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.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index a481defe29f..c7c5405bdd4 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -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) |