From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#11605: 24.1.50; vc-ediff revert annoyance Date: Thu, 27 Jun 2019 17:16:21 +0200 Message-ID: References: <87twkybos7.fsf@gnus.org> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="233966"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: William Xu , 11605@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 27 17:22:01 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 1hgWDp-000yh4-CN for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jun 2019 17:22:01 +0200 Original-Received: from localhost ([::1]:51676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgWDo-0000E3-8O for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jun 2019 11:22:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59052) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgW9F-0004vZ-4A for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:17:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgW9B-0007MD-IP for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:17:14 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgW92-0007Gq-MQ for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:17:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hgW8z-0008EN-Ux for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:17:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Jun 2019 15:17: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.156164858931578 (code B ref 11605); Thu, 27 Jun 2019 15:17:01 +0000 Original-Received: (at 11605) by debbugs.gnu.org; 27 Jun 2019 15:16:29 +0000 Original-Received: from localhost ([127.0.0.1]:39242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgW8S-0008DF-L3 for submit@debbugs.gnu.org; Thu, 27 Jun 2019 11:16:28 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:43786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgW8Q-0008D3-5I for 11605@debbugs.gnu.org; Thu, 27 Jun 2019 11:16:26 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hgW8L-0006xy-6l; Thu, 27 Jun 2019 17:16:23 +0200 In-Reply-To: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> (Dmitry Gutov's message of "Fri, 26 Feb 2016 02:38:35 +0200") 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:161598 Archived-At: Dmitry Gutov writes: >>> (with-current-buffer result-buf >>> ;; Set the parent buffer so that things like >>> ;; C-x v g, C-x v l, ... etc work. >>> - (set (make-local-variable 'vc-parent-buffer) filebuf)) >>> + (set (make-local-variable 'vc-parent-buffer) filebuf) >>> + (revert-buffer nil t)) > > It seems like this might conflict with other uses of vc-find-revision, > like vc-revision-other-window. Where the user is allowed to change the > contents of the returned buffer, and might've done so before we do > this automatic silent revert. > > Maybe do it on ediff's side instead? Yeah, after poking at this a bit more, I agree -- ediff should set up this better, and just calling revert in the vc functions does not seem to be the logical choice. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no