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: undo weirdness with insert-file-contents Date: Fri, 07 Mar 2008 17:04:18 -0500 Message-ID: References: <47C70CFC.30203@gmx.at> <47C88A51.7020205@gmx.at> <47CAA13E.3040909@gmx.at> <47CB2498.1030405@gmx.at> <47CBC035.7030006@gmx.at> <47D10BD9.9050001@gmx.at> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1204927547 2325 80.91.229.12 (7 Mar 2008 22:05:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 7 Mar 2008 22:05:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 07 23:06:15 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 1JXkh9-0003e5-Ka for ged-emacs-devel@m.gmane.org; Fri, 07 Mar 2008 23:05:50 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JXkgb-0003Ob-TQ for ged-emacs-devel@m.gmane.org; Fri, 07 Mar 2008 17:05:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JXkg0-00038q-85 for emacs-devel@gnu.org; Fri, 07 Mar 2008 17:04:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JXkfz-000384-ER for emacs-devel@gnu.org; Fri, 07 Mar 2008 17:04:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JXkfz-00037s-34 for emacs-devel@gnu.org; Fri, 07 Mar 2008 17:04:27 -0500 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JXkfy-0002r6-Ma for emacs-devel@gnu.org; Fri, 07 Mar 2008 17:04:26 -0500 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 70DE32CF9FE; Fri, 7 Mar 2008 17:04:26 -0500 (EST) Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 30D3C3FE0; Fri, 7 Mar 2008 17:04:19 -0500 (EST) Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 152686C808; Fri, 7 Mar 2008 17:04:19 -0500 (EST) In-Reply-To: <47D10BD9.9050001@gmx.at> (martin rudalics's message of "Fri, 07 Mar 2008 10:33:13 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) 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:91666 Archived-At: > martin, who still considers the non-VISIT&REPLACE case obscure and > cannot see any "example" in `smerge-resolve'. Ahem... sorry, it's in the part of smerge-resolve that I haven't yet installed. Basically what it does is this: given a 3-way merge conflict, with 3 branches MINE/BASE/OTHER, I do a narrow-to-region on the conflict, then I save all three branches of the conflict to separate files and do: diff -c -w BASE MINE | patch OTHER >RESULT and if the patch succeeds I do `insert-file-contents' of RESULT without VISIT but with REPLACE. It's indeed somewhat obscure, and indeed, it crashed Emacs when the Unicode branch was merged (because the code didn't expect REPLACE in a narrowed buffer). Stefan