From: Juri Linkov <juri@linkov.net>
Date: Mon, 18 Nov 2019 21:53:11 +0000 (+0200)
Subject: * lisp/vc/ediff-util.el: Set this-command to ediff-quit (bug#38219)
X-Git-Tag: emacs-27.0.90~576^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ba98fb1d735140cb3c6cd5f74674a65d7a45015;p=emacs.git

* 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.
---

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)