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 02:16:22 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1209968201 19362 80.91.229.12 (5 May 2008 06:16:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 May 2008 06:16:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: tromey@redhat.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 05 08:17:17 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 1Jsu0i-0005Cs-OJ for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 08:17:17 +0200 Original-Received: from localhost ([127.0.0.1]:53026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jsu00-0002QF-Uu for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 02:16:33 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jstzv-0002PH-UQ for emacs-devel@gnu.org; Mon, 05 May 2008 02:16:28 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jstzt-0002Ow-VI for emacs-devel@gnu.org; Mon, 05 May 2008 02:16:27 -0400 Original-Received: from [199.232.76.173] (port=49941 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jstzt-0002Ot-OA for emacs-devel@gnu.org; Mon, 05 May 2008 02:16:25 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jstzt-00033q-M5 for emacs-devel@gnu.org; Mon, 05 May 2008 02:16:25 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aq0DACpDHkjO+JghdGdsb2JhbACBU5AiASeXWA X-IronPort-AV: E=Sophos;i="4.27,436,1204520400"; d="scan'208";a="19912816" Original-Received: from smtp.pppoe.ca (HELO smtp.teksavvy.com) ([65.39.196.238]) by ironport2-out.teksavvy.com with ESMTP; 05 May 2008 02:16:24 -0400 Original-Received: from pastel.home ([206.248.152.33]) by smtp.teksavvy.com (Internet Mail Server v1.0) with ESMTP id LLV78924; Mon, 05 May 2008 02:16:24 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 52970856B; Mon, 5 May 2008 02:16:22 -0400 (EDT) In-Reply-To: (Tom Tromey's message of "Sun, 04 May 2008 18:08:51 -0600") 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:96477 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, Stefan