From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#38219: Error on leaving Ediff after killing vital buffer Date: Sun, 17 Nov 2019 23:28:36 +0200 Organization: LINKOV.NET Message-ID: <87a78uxke3.fsf@mail.linkov.net> References: <87o8xbu3wn.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="218263"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: Richard Copley , 38219@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 17 22:32:23 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iWS9e-000ubo-SO for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Nov 2019 22:32:23 +0100 Original-Received: from localhost ([::1]:56478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWS9d-00051i-IO for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Nov 2019 16:32:21 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38644) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWS9L-0004nR-RG for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 16:32:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWS9K-0003yT-O1 for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 16:32:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iWS9K-0003yI-K6 for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 16:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iWS9K-0002Ph-FY for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 16:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Nov 2019 21:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38219 X-GNU-PR-Package: emacs Original-Received: via spool by 38219-submit@debbugs.gnu.org id=B38219.15740263189259 (code B ref 38219); Sun, 17 Nov 2019 21:32:02 +0000 Original-Received: (at 38219) by debbugs.gnu.org; 17 Nov 2019 21:31:58 +0000 Original-Received: from localhost ([127.0.0.1]:42814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWS9G-0002PH-Db for submit@debbugs.gnu.org; Sun, 17 Nov 2019 16:31:58 -0500 Original-Received: from bumble.birch.relay.mailchannels.net ([23.83.209.25]:47716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWS9E-0002P9-Qc for 38219@debbugs.gnu.org; Sun, 17 Nov 2019 16:31:57 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8D995501407; Sun, 17 Nov 2019 21:31:55 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a42.g.dreamhost.com (100-96-169-13.trex.outbound.svc.cluster.local [100.96.169.13]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 12687501173; Sun, 17 Nov 2019 21:31:55 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a42.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.18.5); Sun, 17 Nov 2019 21:31:55 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Abiding-Squirrel: 4f2eb02e0f82f43a_1574026315313_952377247 X-MC-Loop-Signature: 1574026315313:3493407744 X-MC-Ingress-Time: 1574026315312 Original-Received: from pdx1-sub0-mail-a42.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a42.g.dreamhost.com (Postfix) with ESMTP id B91428015C; Sun, 17 Nov 2019 13:31:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=CPPdOktqtKry3PbrlIi3VCsyN6A=; b= pzaEygJWOQDdil1cgccoMAKCj0FsnZfTdvwvJq5JpbBSAXLjBNltm7CQ5Ti7PFsv X4QxNTdARb4/ypOJrySzry1g+6WEj8RK76Tx5AUU/o0AsDVZ7d/B8Cf6SydE3A5a XyEsZYMQfS0O291DUBznueCzvF+N22VJMjrmZuDNucQ= Original-Received: from mail.jurta.org (m91-129-102-1.cust.tele2.ee [91.129.102.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a42.g.dreamhost.com (Postfix) with ESMTPSA id 0729B80154; Sun, 17 Nov 2019 13:31:46 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a42 In-Reply-To: (martin rudalics's message of "Sun, 17 Nov 2019 10:02:06 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:171867 Archived-At: > You could argue that 'ediff' already breaks > > (defalias 'y-or-n-p 'yes-or-no-p) > > They would probably say that consulting 'this-command' after a > 'y-or-n-p' "has worked ever since". Guess whose argument wins. Good example. This means that 'ediff' is broken, here is the fix: diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index a481defe29..c85241b2ea 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -1038,6 +1038,7 @@ ediff-toggle-read-only (format "File %s is under version control. Check it out? " (ediff-abbreviate-file-name file)))) + (setq this-command 'ediff-toggle-read-only) ;; 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 @@ ediff-quit " & show containing session group" ""))) (progn (message "") + (setq this-command 'ediff-quit) (set-buffer ctl-buf) (ediff-really-quit reverse-default-keep-variants)) (select-frame ctl-frm)