From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: patch for smerge buglet Date: Mon, 05 May 2008 14:04:46 -0400 Message-ID: References: <85y76patug.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1210010733 5433 80.91.229.12 (5 May 2008 18:05:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 May 2008 18:05:33 +0000 (UTC) Cc: tromey@redhat.com, emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 05 20:06:08 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jt54P-0000XU-6X for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 20:05:49 +0200 Original-Received: from localhost ([127.0.0.1]:59988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jt53g-0002ck-W7 for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 14:05:05 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jt53c-0002cT-5m for emacs-devel@gnu.org; Mon, 05 May 2008 14:05:00 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jt53a-0002bw-Go for emacs-devel@gnu.org; Mon, 05 May 2008 14:04:59 -0400 Original-Received: from [199.232.76.173] (port=53582 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jt53a-0002bt-AC for emacs-devel@gnu.org; Mon, 05 May 2008 14:04:58 -0400 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182] helo=ironport2-out.teksavvy.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jt53V-0006b5-K6; Mon, 05 May 2008 14:04:53 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AskCAJzpHkjO+JghdGdsb2JhbACBU5AnASeZNg X-IronPort-AV: E=Sophos;i="4.27,438,1204520400"; d="scan'208";a="19938657" Original-Received: from smtp.pppoe.ca (HELO smtp.teksavvy.com) ([65.39.196.238]) by ironport2-out.teksavvy.com with ESMTP; 05 May 2008 14:04:51 -0400 Original-Received: from pastel.home ([206.248.152.33]) by smtp.teksavvy.com (Internet Mail Server v1.0) with ESMTP id LXJ42951; Mon, 05 May 2008 14:04:51 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 35EB87FFC; Mon, 5 May 2008 14:04:46 -0400 (EDT) In-Reply-To: <85y76patug.fsf@lola.goethe.zz> (David Kastrup's message of "Mon, 05 May 2008 13:11:35 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:96513 Archived-At: >>> In a vc-dir buffer I used "f" to open a ChangeLog file that had a >>> conflict. As often happens with ChangeLog, the conflict was on the >>> very first line of the file. To my surprise, the file was visited >>> with point at EOF. >> >>> This patch to smerge-mode fixed the problem for me. >> >> Thanks, installed, > The git conflict markers are sometimes left in the file. Do you use git > yourself, or should I send an example when this happens the next time? I don't know what you mean by "left in the file" or what it has to do with smerge-mode. If Git does not use the standard diff3 markers, then it would be much more valuable to change Git than to adapt smerge-mode to it. Stefan