From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#11605: 24.1.50; vc-ediff revert annoyance Date: Fri, 26 Feb 2016 12:36:18 +0200 Message-ID: References: <87twkybos7.fsf@gnus.org> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> <87oab4ui0k.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1456483054 28115 80.91.229.3 (26 Feb 2016 10:37:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Feb 2016 10:37:34 +0000 (UTC) Cc: William Xu , 11605@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 26 11:37:15 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aZFln-0001W7-Ef for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 11:37:11 +0100 Original-Received: from localhost ([::1]:48706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFlm-0003ER-MS for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 05:37:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFli-0003E4-8v for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:37:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZFle-0006RA-8f for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:37:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFle-0006R4-4q for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:37:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aZFld-0004SO-Rz for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:37:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Feb 2016 10:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11605 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch confirmed Original-Received: via spool by 11605-submit@debbugs.gnu.org id=B11605.145648298817063 (code B ref 11605); Fri, 26 Feb 2016 10:37:01 +0000 Original-Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 10:36:28 +0000 Original-Received: from localhost ([127.0.0.1]:46943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZFl6-0004R9-DC for submit@debbugs.gnu.org; Fri, 26 Feb 2016 05:36:28 -0500 Original-Received: from mail-wm0-f47.google.com ([74.125.82.47]:35100) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZFl5-0004Qx-9Q for 11605@debbugs.gnu.org; Fri, 26 Feb 2016 05:36:27 -0500 Original-Received: by mail-wm0-f47.google.com with SMTP id c200so66353723wme.0 for <11605@debbugs.gnu.org>; Fri, 26 Feb 2016 02:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=wm86NuiUdmCoJbha7kWSxpTc0bG9uBd48qbxNJqoxkQ=; b=e8iT3xe/nstqFDqnUELyo0Ajc1yfqWd2IgfGkXOzmm6Ru4OdMxwlFxwyYjKY8T6ASA 7S+8GL9TXIcjsVWsECCB6G+ZBKGzP62O9ki5E7ET4tD/3HEhxRPbmGBkR3tVqH3pYX3w /BX23Bv3O3wWRsMmtikUNixvYC3ydzNpNoV6+lfdOzh4ow7bf59V4ZsUa+lm+rXmEB+w 3uCoBhmS70TKM6JL+0UYDUcJS4g+H7RA5E2ovLVK4Ta/tgZpAO1q6yyFCReNZ/XquiJn dZNeWDfv4rp+IXc2zAYNPGgtf2uxpGvd50g2ynxXS5KWE5S/RTy+bsLzefEt7NT9IljZ jZGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=wm86NuiUdmCoJbha7kWSxpTc0bG9uBd48qbxNJqoxkQ=; b=DsVSrXxj+a7/ZD3Qn4ws/JRibJCz2w0g299vZhvrOjsbTz7tkimn674jyWHOBSgp5P eCrstEZ3Xv9SV3aP0T0tSuZU/c49hnXhgIz6l0ot5zNvssplj9fbM0J5vkT9wTDy1dug Jt5sUbksnGozCX4WQl/Nh/YM098awuwfC3wQc2etOdMgQw/zOJUSqsudF+TCpu/MtGc4 NHBQH7FvkTW5qlt40KiYs9dgzoiJ/rxTr3+TvqmnU9pShqdad/BWvOZmoqI1xeWlnFZk WgpKZdyj2OBu9crSG5Y34Uo5PHq1cC9LSNv1N3kvtgPugrFRidujbWAsuvl0etDyQ4/W cCKA== X-Gm-Message-State: AD7BkJKeo75De2IHxrqTRz3w7NTySp/Qw9HkKCoJ9aCnGUBB7Kcmkm2AAQ8rcKrZzZAPOQ== X-Received: by 10.28.23.196 with SMTP id 187mr1744098wmx.17.1456482981744; Fri, 26 Feb 2016 02:36:21 -0800 (PST) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id ys9sm11819387wjc.35.2016.02.26.02.36.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Feb 2016 02:36:20 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: <87oab4ui0k.fsf@gnus.org> 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: 208.118.235.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113875 Archived-At: On 02/26/2016 08:01 AM, Lars Ingebrigtsen wrote: > If the buffer with the comparison file had been killed before all this > had happened, we wouldn't have gotten the "file changed on disk" thing, > yes... That may be a better fix. Maybe so. But I'm not sure it's easy to compute the exact buffer name, to kill it. Or disable the automatic prompting somehow (add a NOWARN argument to vc-find-revision?), and call revert-buffer from ediff after.