From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Git conflict VC state detection Date: Mon, 11 Nov 2013 01:53:29 +0100 Message-ID: <87li0vzrli.fsf@wanadoo.es> References: <527BCD00.9090105@openmailbox.org> <87d2mcdrgu.fsf@yandex.ru> <877gcia4c5.fsf@web.de> <87fvr61f4d.fsf@wanadoo.es> <877gch1uul.fsf@wanadoo.es> <87wqkgyp7z.fsf_-_@wanadoo.es> <527FFA0B.1080805@yandex.ru> <87ppq7zyqx.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384131228 9940 80.91.229.3 (11 Nov 2013 00:53:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Nov 2013 00:53:48 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 01:53:52 2013 Return-path: Envelope-to: ged-emacs-devel@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 1VfflG-0003Je-0A for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2013 01:53:50 +0100 Original-Received: from localhost ([::1]:34218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfflF-0000PZ-Dh for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2013 19:53:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vffl6-0000J9-HW for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:53:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vffkz-0006Os-Qg for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:53:40 -0500 Original-Received: from smtp20.acens.net ([86.109.99.144]:21292 helo=smtp.movistar.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vffkz-0006Oo-GL for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:53:33 -0500 X-CTCH-RefID: str=0001.0A0B020C.52802A8A.0062, ss=1, re=0.100, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Spam: Unknown Original-Received: from qcore (83.46.215.247) by smtp.movistar.es (8.6.117.02) (authenticated as 981711563$telefonica.net) id 52765FB0004B1723; Mon, 11 Nov 2013 00:53:30 +0000 In-Reply-To: (Stefan Monnier's message of "Sun, 10 Nov 2013 19:16:56 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 86.109.99.144 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:165134 Archived-At: Stefan Monnier writes: > So, an alternative to fixing vc-state is to add a vc-git-conflict-p called > from the find-file-hook. IIUC what you propose does not reduce the number of git invocations while visiting/reverting a file but disperses the code change over a broader area.