From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sean Sieger Newsgroups: gmane.emacs.help Subject: Re: ediff Date: Sat, 11 Apr 2009 19:20:36 -0400 Message-ID: <87ocv2srp7.fsf@gmail.com> References: <87ocv4tum0.fsf@gmail.com> <49E049B4.6050400@irisa.fr> <87y6u7gk6n.fsf@gmail.com> <87r5zzghke.fsf@gmail.com> <026D8047-C68F-4102-B551-2BBD9D059B2D@Web.DE> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1239492082 28803 80.91.229.12 (11 Apr 2009 23:21:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 Apr 2009 23:21:22 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sun Apr 12 01:22:41 2009 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LsmX3-00082D-CM for geh-help-gnu-emacs@m.gmane.org; Sun, 12 Apr 2009 01:22:41 +0200 Original-Received: from localhost ([127.0.0.1]:48997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsmVe-0003fc-MB for geh-help-gnu-emacs@m.gmane.org; Sat, 11 Apr 2009 19:21:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LsmVK-0003fF-0M for help-gnu-emacs@gnu.org; Sat, 11 Apr 2009 19:20:54 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LsmVF-0003ev-HB for help-gnu-emacs@gnu.org; Sat, 11 Apr 2009 19:20:53 -0400 Original-Received: from [199.232.76.173] (port=40379 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsmVF-0003es-Cs for help-gnu-emacs@gnu.org; Sat, 11 Apr 2009 19:20:49 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:32846 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LsmVF-0003mF-0x for help-gnu-emacs@gnu.org; Sat, 11 Apr 2009 19:20:49 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1LsmVD-0000cB-9Z for help-gnu-emacs@gnu.org; Sat, 11 Apr 2009 23:20:47 +0000 Original-Received: from pool-70-18-28-77.ny325.east.verizon.net ([70.18.28.77]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 11 Apr 2009 23:20:47 +0000 Original-Received: from sean.sieger by pool-70-18-28-77.ny325.east.verizon.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 11 Apr 2009 23:20:47 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pool-70-18-28-77.ny325.east.verizon.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) Cancel-Lock: sha1:2+I+PRJQBiLZjY8JfNyeRPyee50= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:63682 Archived-At: Peter Dyballa writes: It's one possible form. The other is the unified context diff, involving the -u option. Got it. I found ediff-custom-diff-options and used it. You can easily check whether it works: copy the elder a version to / tmp and then patch it with the Ediff output file (Ediff can also patch). Tried this also. Thank you for the encouragement, Pete. Um, I'm still trying to see it through a developer's eyes. The exercise that you suggested helped a lot though. Say I don't want to mess up files in my emacs/ so I do something like move a copy of buffers.texi to /tmp ... but see ... that's where it breaks down in my mind, knowing that when I run Ediff, it's going to rename the elder file buffers.texi.orig ... but I cannot start out with two files named buffers.texi in /tmp ... Help, please.