Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 27 Jun 2019 15:16:29 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jun 27 11:16:29 2019 Received: from localhost ([127.0.0.1]:39242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1hgW8S-0008DF-L3 for submit <at> debbugs.gnu.org; Thu, 27 Jun 2019 11:16:28 -0400 Received: from quimby.gnus.org ([80.91.231.51]:43786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1hgW8Q-0008D3-5I for 11605 <at> debbugs.gnu.org; Thu, 27 Jun 2019 11:16:26 -0400 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 <larsi@HIDDEN>) id 1hgW8L-0006xy-6l; Thu, 27 Jun 2019 17:16:23 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN> Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> Date: Thu, 27 Jun 2019 17:16:21 +0200 In-Reply-To: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> (Dmitry Gutov's message of "Fri, 26 Feb 2016 02:38:35 +0200") Message-ID: <m3woh75a9m.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov <dgutov@HIDDEN> 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 (mak [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 11605 Cc: William Xu <william.xwl@HIDDEN>, 11605 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Dmitry Gutov <dgutov@HIDDEN> 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
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 10:36:28 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 26 05:36:28 2016 Received: from localhost ([127.0.0.1]:46943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aZFl6-0004R9-DC for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 05:36:28 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35100) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <raaahh@HIDDEN>) id 1aZFl5-0004Qx-9Q for 11605 <at> debbugs.gnu.org; Fri, 26 Feb 2016 05:36:27 -0500 Received: by mail-wm0-f47.google.com with SMTP id c200so66353723wme.0 for <11605 <at> 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) 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) Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance To: Lars Ingebrigtsen <larsi@HIDDEN> References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> <87oab4ui0k.fsf@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <b1ba5e26-07ef-f3d0-1c07-446f95bf7019@HIDDEN> Date: Fri, 26 Feb 2016 12:36:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <87oab4ui0k.fsf@HIDDEN> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 11605 Cc: William Xu <william.xwl@HIDDEN>, 11605 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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.
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 10:10:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 26 05:10:30 2016 Received: from localhost ([127.0.0.1]:46927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aZFLy-0003ks-9b for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 05:10:30 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35245) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <raaahh@HIDDEN>) id 1aZFLx-0003kg-Bv for 11605 <at> debbugs.gnu.org; Fri, 26 Feb 2016 05:10:29 -0500 Received: by mail-wm0-f47.google.com with SMTP id c200so65438387wme.0 for <11605 <at> debbugs.gnu.org>; Fri, 26 Feb 2016 02:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=f8mS/NVKBX1gLEB2BUv2PFVHos3eW8p2Ew6xB+EYpKU=; b=TP5ip+5NDa5X8uAdC9dezmDr6DXVos5vOpeKYTRhdidVsVgTUb1WUz2hdXBSt/hwV6 6I4Dmv92Jq4PKbVqtnRaq6rLbE2r8dgXl3UMHb0UtwPRS0AHXfx/Oeas8P8iHiHN+nzJ mRXpZR0smr9RYszRxadJ7qHj1lJYgOahlIF+aPTLVWlf8B6xqYzyBbAOuJ1IY4jfYACm eZTpukpFcYYWAarGfbfWCSpguwBFNKU6u6a7oL21yNJcRyByv0/QfIcLUiLjHrWdYucw LsUx32nBQyfFqgN9EB9k3M+COVyM1EXtZX/uH+hMRBAkTD/b7utjztNhAzJ7XPyTNFp/ jQIw== 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:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=f8mS/NVKBX1gLEB2BUv2PFVHos3eW8p2Ew6xB+EYpKU=; b=NjG2Ki7XwcAYTdeZpbgkxi93czqEXLidaG8C7EqRqaCoYDWFAtHKfz91DaBYJzpfTB 8YJgufrvdTjwkNeUKxk7ajTPIxDlRYhM8NJiqh+bLFRoLadYMiwJ+cKy222yTmJ/JMgg iWdtUDKMQHP6Y5azPTVq2boxLkF8l4Zm+h4anq3RLzgSLnuuTKS6GcfmdOqH6G1AVDg7 Fi48wxXfekBuYzuESepehKoeUGcnsjv5uAHBntgvEfhKw44tteMt7aGh4YZFhqSuCWvj pRJ96HP1MBiW+Qxa5s462kHBB3757JnvnxQlX4NVcV2JI5ydpHH3MLBrOpzEsT5eYKov kTkA== X-Gm-Message-State: AD7BkJJcs/ewASdWJHc9pmIhOCEWOViTFsYGKzzGFA2arMGdMY+cR4dD/KWmO3/YaqXo7w== X-Received: by 10.194.78.148 with SMTP id b20mr768404wjx.71.1456481423763; Fri, 26 Feb 2016 02:10:23 -0800 (PST) Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id fv6sm11779401wjc.12.2016.02.26.02.10.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Feb 2016 02:10:22 -0800 (PST) Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance To: William Xu <william.xwl@HIDDEN>, 11605 <at> debbugs.gnu.org References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> <mdig8pr3fzbyl2.fsf@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <85c450a4-ee43-b789-fbc5-8b095f633773@HIDDEN> Date: Fri, 26 Feb 2016 12:10:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <mdig8pr3fzbyl2.fsf@HIDDEN> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 11605 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) On 02/26/2016 11:38 AM, William Xu wrote: > It sounds strange that one would try to modify it. I thought the > checkout version is only for comparison. The file name XX.~yy~ looks > also very similar to automatic backup files, e.g., "!tmp!foo.cpp.~1~". I agree it is strange, but it's not out of the question. Maybe the user wants to restore an old version of a function, and on a whim, started retouching it in the "old version" buffer?
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at submit) by debbugs.gnu.org; 26 Feb 2016 09:39:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 26 04:39:23 2016 Received: from localhost ([127.0.0.1]:46888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aZErr-00030C-Ev for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 04:39:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36044) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErp-0002zz-NA for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 04:39:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErk-0005jm-0d for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 04:39:16 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_00,FREEMAIL_FROM, FSL_HELO_BARE_IP_2,RCVD_NUMERIC_HELO autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErj-0005ji-Ti for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 04:39:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErj-0002MY-4f for bug-gnu-emacs@HIDDEN; Fri, 26 Feb 2016 04:39:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErf-0005h6-5A for bug-gnu-emacs@HIDDEN; Fri, 26 Feb 2016 04:39:15 -0500 Received: from plane.gmane.org ([80.91.229.3]:37578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZEre-0005gN-UV for bug-gnu-emacs@HIDDEN; Fri, 26 Feb 2016 04:39:11 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from <geb-bug-gnu-emacs@HIDDEN>) id 1aZErc-0000oM-LA for bug-gnu-emacs@HIDDEN; Fri, 26 Feb 2016 10:39:08 +0100 Received: from 212.211.134.206 ([212.211.134.206]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for <bug-gnu-emacs@HIDDEN>; Fri, 26 Feb 2016 10:39:08 +0100 Received: from william.xwl by 212.211.134.206 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for <bug-gnu-emacs@HIDDEN>; Fri, 26 Feb 2016 10:39:08 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: bug-gnu-emacs@HIDDEN From: William Xu <william.xwl@HIDDEN> Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance Date: Fri, 26 Feb 2016 10:38:49 +0100 Organization: the Church of Emacs Lines: 15 Message-ID: <mdig8pr3fzbyl2.fsf@HIDDEN> References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> Mime-Version: 1.0 Content-Type: text/plain X-Complaints-To: usenet@HIDDEN X-Gmane-NNTP-Posting-Host: 212.211.134.206 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.91 (darwin) Cancel-Lock: sha1:QtQflrvw+kOrAsfUmuIlPF6IGs0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Dmitry Gutov writes: > 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. [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [208.118.235.92 listed in wl.mailspike.net] 0.9 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (william.xwl[at]gmail.com) 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=geb-bug-gnu-emacs%40m.gmane.org; ip=208.118.235.92; r=debbugs.gnu.org] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Dmitry Gutov writes: > 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. [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [208.118.235.92 listed in wl.mailspike.net] 0.9 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (william.xwl[at]gmail.com) 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=geb-bug-gnu-emacs%40m.gmane.org;ip=208.118.235.92;r=debbugs.gnu.org] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Dmitry Gutov <dgutov@HIDDEN> writes: > 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. It sounds strange that one would try to modify it. I thought the checkout version is only for comparison. The file name XX.~yy~ looks also very similar to automatic backup files, e.g., "!tmp!foo.cpp.~1~". -- William My idea of roughing it turning the air conditioner too low.
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 06:02:17 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 26 01:02:17 2016 Received: from localhost ([127.0.0.1]:46625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aZBTl-0007ji-Ju for submit <at> debbugs.gnu.org; Fri, 26 Feb 2016 01:02:17 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:51779) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <larsi@HIDDEN>) id 1aZBTk-0007jb-BP for 11605 <at> debbugs.gnu.org; Fri, 26 Feb 2016 01:02:16 -0500 Received: from [175.103.25.178] (helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from <larsi@HIDDEN>) id 1aZBTM-0004rK-Ow; Fri, 26 Feb 2016 07:01:53 +0100 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN> Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> Date: Fri, 26 Feb 2016 16:31:47 +1030 In-Reply-To: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> (Dmitry Gutov's message of "Fri, 26 Feb 2016 02:38:35 +0200") Message-ID: <87oab4ui0k.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1aZBTM-0004rK-Ow X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@HIDDEN MailScanner-NULL-Check: 1457071314.16277@G8aiQ8boKEB2anH8VfE6eA X-Spam-Status: No X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 11605 Cc: William Xu <william.xwl@HIDDEN>, 11605 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.0 (/) Dmitry Gutov <dgutov@HIDDEN> writes: > 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? It does, but then it goes into all the "File %s changed on disk. Reread from disk?" stuff, which is what the bug is about. But, I mean, the file may have changed, so... >>> (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? 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. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 00:38:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 25 19:38:46 2016 Received: from localhost ([127.0.0.1]:46459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aZ6Qf-0001u6-RJ for submit <at> debbugs.gnu.org; Thu, 25 Feb 2016 19:38:45 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35352) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <raaahh@HIDDEN>) id 1aZ6Qe-0001tq-1p for 11605 <at> debbugs.gnu.org; Thu, 25 Feb 2016 19:38:44 -0500 Received: by mail-wm0-f46.google.com with SMTP id c200so52036120wme.0 for <11605 <at> 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) 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) Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance To: Lars Ingebrigtsen <larsi@HIDDEN>, William Xu <william.xwl@HIDDEN> References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> <87twkybos7.fsf@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@HIDDEN> Date: Fri, 26 Feb 2016 02:38:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <87twkybos7.fsf@HIDDEN> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 11605 Cc: 11605 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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?
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Received: (at 11605) by debbugs.gnu.org; 24 Feb 2016 06:34:20 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 24 01:34:20 2016 Received: from localhost ([127.0.0.1]:42363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1aYT1g-0002GX-7h for submit <at> debbugs.gnu.org; Wed, 24 Feb 2016 01:34:20 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:40965) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from <larsi@HIDDEN>) id 1aYT1e-0002GP-Sw for 11605 <at> debbugs.gnu.org; Wed, 24 Feb 2016 01:34:19 -0500 Received: from cpe-60-225-211-161.nsw.bigpond.net.au ([60.225.211.161] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from <larsi@HIDDEN>) id 1aYT1B-0003Oz-17; Wed, 24 Feb 2016 07:33:49 +0100 From: Lars Ingebrigtsen <larsi@HIDDEN> To: William Xu <william.xwl@HIDDEN> Subject: Re: bug#11605: 24.1.50; vc-ediff revert annoyance References: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> Date: Wed, 24 Feb 2016 17:33:44 +1100 In-Reply-To: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> (William Xu's message of "Sat, 2 Jun 2012 12:31:10 +0800") Message-ID: <87twkybos7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1aYT1B-0003Oz-17 X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@HIDDEN MailScanner-NULL-Check: 1456900432.28124@OBIBVpdNjrMn+MrORa2sKw X-Spam-Status: No X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 11605 Cc: 11605 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.0 (/) William Xu <william.xwl@HIDDEN> writes: > 1. emacs -Q > 2. visit a version controlled file, say `foo'. > 3. M-x vc-ediff, run it couple of times. > > You will see this annoying message many times: > > File foo.~master~ changed on disk. Reread from disk? (yes or no) I can confirm that this bug is still present in the Emacs trunk. > The reason is the ~master~ file is checked out everytime we run > vc-ediff, and after ediff session, the ~master~ buffer is always left > there, hence, when running vc-ediff multiple times it constantly asks > you whether you want to revert. Why not let it revert automatically? > > How about this patch? [...] I think the patch sounds reasonable, but the vc machinery is something with which I'm not overly familiar. Could somebody take a peek at this patch? > From d2af0f4dcc81b39d9360135244d6870388a264a3 Mon Sep 17 00:00:00 2001 > From: William Xu <william.xwl@HIDDEN> > Date: Sat, 2 Jun 2012 12:16:45 +0800 > Subject: [PATCH] (vc-find-revision): Auto revert file revision buffer > quietly. > > --- > lisp/vc/vc.el | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index 87e4e1c..bd337d0 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -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)))) > (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)) > result-buf))) > > ;; Header-insertion code -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at submit) by debbugs.gnu.org; 2 Jun 2012 04:33:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 02 00:33:09 2012 Received: from localhost ([127.0.0.1]:53723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1Sag1V-0006ix-Jh for submit <at> debbugs.gnu.org; Sat, 02 Jun 2012 00:33:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49493) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from <william.xwl@HIDDEN>) id 1Sag1T-0006ic-96 for submit <at> debbugs.gnu.org; Sat, 02 Jun 2012 00:33:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <william.xwl@HIDDEN>) id 1Safzh-0001l1-0S for submit <at> debbugs.gnu.org; Sat, 02 Jun 2012 00:31:18 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:46589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <william.xwl@HIDDEN>) id 1Safzg-0001ku-Qv for submit <at> debbugs.gnu.org; Sat, 02 Jun 2012 00:31:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <william.xwl@HIDDEN>) id 1Safzf-0006na-9v for bug-gnu-emacs@HIDDEN; Sat, 02 Jun 2012 00:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <william.xwl@HIDDEN>) id 1Safzd-0001kb-DR for bug-gnu-emacs@HIDDEN; Sat, 02 Jun 2012 00:31:14 -0400 Received: from mail-vb0-f41.google.com ([209.85.212.41]:38371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <william.xwl@HIDDEN>) id 1Safzd-0001kD-6p for bug-gnu-emacs@HIDDEN; Sat, 02 Jun 2012 00:31:13 -0400 Received: by vbbey12 with SMTP id ey12so2021313vbb.0 for <bug-gnu-emacs@HIDDEN>; Fri, 01 Jun 2012 21:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=XzB6nrulGGmn4/ODNiJ6Cut8Bl1+g3VoB2PVcWD1myc=; b=UOQ8jzf54LQu+w2GJSTCeCGXzd6ctWDO6i3/uRDoEayvA66rUuiCQSRK4nms7slACH wWiWUbMonU5OBEzhDC/0HzXGIHleGhQuh9dkyFVpE+eMnPgIyg/Ec61tJj6v2E5r3DRk e+VAMfzBa9chEMHF7xsDodvdrZfw9T2gMwdyvHSC9MpVdgNbzUx0V7LzDBuKs7EWfcBo J5hE1GhLUwq6gwsk1p5a8xNmjtZzEwxbbEl+ZUGLBb72en3AlpLr0rTmi+tFOZHdrf2U QVpgvRITLfffqnzz6uxr11/Mg80uFuZOxo78nAhc4w81JuKTCKqsaTc8Azdirfc/L0Pa tGgA== MIME-Version: 1.0 Received: by 10.220.115.135 with SMTP id i7mr5038584vcq.29.1338611470776; Fri, 01 Jun 2012 21:31:10 -0700 (PDT) Received: by 10.52.69.139 with HTTP; Fri, 1 Jun 2012 21:31:10 -0700 (PDT) Date: Sat, 2 Jun 2012 12:31:10 +0800 Message-ID: <CACzMC-AyMUwxot1UPP-a8WhCURvjHrH_9nqkPEZhknzMhygZSg@HIDDEN> Subject: 24.1.50; vc-ediff revert annoyance From: William Xu <william.xwl@HIDDEN> To: bug-gnu-emacs@HIDDEN Content-Type: multipart/mixed; boundary=f46d043d67ef353afd04c175c546 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.1 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Sender: debbugs-submit-bounces <at> debbugs.gnu.org Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org X-Spam-Score: -6.1 (------) --f46d043d67ef353afd04c175c546 Content-Type: text/plain; charset=UTF-8 Steps to reproduce: 1. emacs -Q 2. visit a version controlled file, say `foo'. 3. M-x vc-ediff, run it couple of times. You will see this annoying message many times: File foo.~master~ changed on disk. Reread from disk? (yes or no) The reason is the ~master~ file is checked out everytime we run vc-ediff, and after ediff session, the ~master~ buffer is always left there, hence, when running vc-ediff multiple times it constantly asks you whether you want to revert. Why not let it revert automatically? How about this patch? -- William http://xwl.appspot.com --f46d043d67ef353afd04c175c546 Content-Type: application/octet-stream; name="0001-vc-find-revision-Auto-revert-file-revision-buffer-qu.patch" Content-Disposition: attachment; filename="0001-vc-find-revision-Auto-revert-file-revision-buffer-qu.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h2y6p6uq0 RnJvbSBkMmFmMGY0ZGNjODFiMzlkOTM2MDEzNTI0NGQ2ODcwMzg4YTI2NGEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBXaWxsaWFtIFh1IDx3aWxsaWFtLnh3bEBnbWFpbC5jb20+CkRh dGU6IFNhdCwgMiBKdW4gMjAxMiAxMjoxNjo0NSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdICh2Yy1m aW5kLXJldmlzaW9uKTogQXV0byByZXZlcnQgZmlsZSByZXZpc2lvbiBidWZmZXIKIHF1aWV0bHku CgotLS0KIGxpc3AvdmMvdmMuZWwgfCAgICA2ICsrKystLQogMSBmaWxlcyBjaGFuZ2VkLCA0IGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy5lbCBi L2xpc3AvdmMvdmMuZWwKaW5kZXggODdlNGUxYy4uYmQzMzdkMCAxMDA2NDQKLS0tIGEvbGlzcC92 Yy92Yy5lbAorKysgYi9saXNwL3ZjL3ZjLmVsCkBAIC0xODE1LDExICsxODE1LDEzIEBAIFVzZSBC QUNLRU5EIGFzIHRoZSBWQyBiYWNrZW5kIGlmIHNwZWNpZmllZC4iCiAJCShkZWxldGUtZmlsZSBm aWxlbmFtZSkpKSkKIAkgICh2Yy1tb2RlLWxpbmUgZmlsZSkpCiAJKG1lc3NhZ2UgIkNoZWNraW5n IG91dCAlcy4uLmRvbmUiIGZpbGVuYW1lKSkpCi0gICAgKGxldCAoKHJlc3VsdC1idWYgKGZpbmQt ZmlsZS1ub3NlbGVjdCBmaWxlbmFtZSkpKQorICAgIChsZXQgKChyZXN1bHQtYnVmIChvciAoZ2V0 LWZpbGUtYnVmZmVyIGZpbGVuYW1lKQorICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1m aWxlLW5vc2VsZWN0IGZpbGVuYW1lKSkpKQogICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgcmVz dWx0LWJ1ZgogCTs7IFNldCB0aGUgcGFyZW50IGJ1ZmZlciBzbyB0aGF0IHRoaW5ncyBsaWtlCiAJ OzsgQy14IHYgZywgQy14IHYgbCwgLi4uIGV0YyB3b3JrLgotCShzZXQgKG1ha2UtbG9jYWwtdmFy aWFibGUgJ3ZjLXBhcmVudC1idWZmZXIpIGZpbGVidWYpKQorCShzZXQgKG1ha2UtbG9jYWwtdmFy aWFibGUgJ3ZjLXBhcmVudC1idWZmZXIpIGZpbGVidWYpCisgICAgICAgIChyZXZlcnQtYnVmZmVy IG5pbCB0KSkKICAgICAgIHJlc3VsdC1idWYpKSkKIAogOzsgSGVhZGVyLWluc2VydGlvbiBjb2Rl Ci0tIAoxLjcuOC4yCgo= --f46d043d67ef353afd04c175c546--
William Xu <william.xwl@HIDDEN>
:bug-gnu-emacs@HIDDEN
.
Full text available.bug-gnu-emacs@HIDDEN
:bug#11605
; Package emacs
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.