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 02:38:35 +0200 Message-ID: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> References: <87twkybos7.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 1456447161 18871 80.91.229.3 (26 Feb 2016 00:39:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Feb 2016 00:39:21 +0000 (UTC) Cc: 11605@debbugs.gnu.org To: Lars Ingebrigtsen , William Xu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 26 01:39:10 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 1aZ6R4-0005kB-91 for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 01:39:10 +0100 Original-Received: from localhost ([::1]:46650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ6R3-0006g8-NO for geb-bug-gnu-emacs@m.gmane.org; Thu, 25 Feb 2016 19:39:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ6Qz-0006fn-F1 for bug-gnu-emacs@gnu.org; Thu, 25 Feb 2016 19:39:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZ6Qw-0002vd-9K for bug-gnu-emacs@gnu.org; Thu, 25 Feb 2016 19:39:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ6Qw-0002vT-5l for bug-gnu-emacs@gnu.org; Thu, 25 Feb 2016 19:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aZ6Qw-0001uZ-0t for bug-gnu-emacs@gnu.org; Thu, 25 Feb 2016 19:39:02 -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 00:39: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.14564471267326 (code B ref 11605); Fri, 26 Feb 2016 00:39:01 +0000 Original-Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 00:38:46 +0000 Original-Received: from localhost ([127.0.0.1]:46459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZ6Qf-0001u6-RJ for submit@debbugs.gnu.org; Thu, 25 Feb 2016 19:38:45 -0500 Original-Received: from mail-wm0-f46.google.com ([74.125.82.46]:35352) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZ6Qe-0001tq-1p for 11605@debbugs.gnu.org; Thu, 25 Feb 2016 19:38:44 -0500 Original-Received: by mail-wm0-f46.google.com with SMTP id c200so52036120wme.0 for <11605@debbugs.gnu.org>; Thu, 25 Feb 2016 16:38:43 -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-type:content-transfer-encoding; bh=32HQ0jGJ7UsNumPCZx65UOFv9ebYdsaf5CjA3SNvNME=; b=qu2cVgv19eiIGHSl7Ge7HHSYnglrLewpUtQQL9r7AsSRsIwzDkIdE5vxJ57c3+PszX 3Qm6tQkXCBfMPywFPKTruCzIE2patqOq/oh+9AwF+6wFHmMsPuYlV71f9wRgBT2sTZMl UxurTTenjQZsDBSHcqpQWxE4UzHggpKvy4bP4naS36+VQaE4EHWpcY8cxdE4qH+1H5Yq Y2ESpK1RFqbeNN8Yqws4J0betjL1hWHd6AvxGxztJlhJdPwFQjZfFMWX/VakpY3TXmGt UL19fSJBSk84ZrKJBJBtjzsTgZjdiBu94gtyldO3ic24ZydONvFmBcBYtp65sZK17Qtr Z+ow== 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-type :content-transfer-encoding; bh=32HQ0jGJ7UsNumPCZx65UOFv9ebYdsaf5CjA3SNvNME=; b=cFYY1QNPWKvwxZGZ1Y+UzNf1mBqTVRSJvWO52nj2+D25n3E3+4Xkn6fLLv4i84fFK2 tQGGPeDRJDX96jZyYHRTHTLcu/9H/XoAP+lTG7rqgpG5JTyCPkNtBdU4YHUx9mHmnFml ZBF72HZJA80Nx7CuGJjuOuXMVEgb1OyYoZKkQMQVEoUC6cCUfrVpUjmkPoA4A0aCl1ds 2TZbCtH6Bcf2d050GhejLqEK0O8yjypm6HwP5nZ8F8rWf5OTN6hdp4wAODZb6n2aeJXU Olvp7Mnoz6QRiEyFdRCDbke8x4JR3NyXpdcVJ/LXgnZPEKGkk0L5CB0i5d7zKotT6QGi VDLA== X-Gm-Message-State: AG10YOTXqHrhhCzPV/mZKOP+8Rj5FsGP6KS9VmJtRkB3uzyPkTzxx5f8jaVQ7H608IJdYQ== X-Received: by 10.194.209.204 with SMTP id mo12mr52394570wjc.69.1456447118423; Thu, 25 Feb 2016 16:38:38 -0800 (PST) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id e19sm639005wmd.1.2016.02.25.16.38.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Feb 2016 16:38:37 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: <87twkybos7.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:113822 Archived-At: On 02/24/2016 08:33 AM, Lars Ingebrigtsen wrote: >> @@ -1815,11 +1815,13 @@ Use BACKEND as the VC backend if specified." >> (delete-file filename)))) >> (vc-mode-line file)) >> (message "Checking out %s...done" filename))) >> - (let ((result-buf (find-file-noselect filename))) >> + (let ((result-buf (or (get-file-buffer filename) >> + (find-file-noselect filename)))) Doesn't find-file-noselect call get-file-buffer anyway? >> (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?