From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Oleksandr Gavenko Newsgroups: gmane.emacs.help Subject: Re: ediff unified patch format Date: Tue, 12 Oct 2010 14:56:59 +0300 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1286884686 29679 80.91.229.12 (12 Oct 2010 11:58:06 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 12 Oct 2010 11:58:06 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Oct 12 13:58:04 2010 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.69) (envelope-from ) id 1P5dUZ-00038W-GM for geh-help-gnu-emacs@m.gmane.org; Tue, 12 Oct 2010 13:58:03 +0200 Original-Received: from localhost ([127.0.0.1]:52307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5dUY-00022m-Q3 for geh-help-gnu-emacs@m.gmane.org; Tue, 12 Oct 2010 07:58:03 -0400 Original-Received: from [140.186.70.92] (port=60450 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5dTp-00020f-7n for help-gnu-emacs@gnu.org; Tue, 12 Oct 2010 07:57:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5dTk-0007JQ-9v for help-gnu-emacs@gnu.org; Tue, 12 Oct 2010 07:57:17 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:45534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5dTj-0007Ir-KY for help-gnu-emacs@gnu.org; Tue, 12 Oct 2010 07:57:12 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1P5dTd-0002do-Ky for help-gnu-emacs@gnu.org; Tue, 12 Oct 2010 13:57:05 +0200 Original-Received: from 91.193.68.214 ([91.193.68.214]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Oct 2010 13:57:05 +0200 Original-Received: from gavenko by 91.193.68.214 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Oct 2010 13:57:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 24 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 91.193.68.214 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.9) Gecko/20100915 Thunderbird/3.1.4 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:75111 Archived-At: On 07.10.2010 20:43, suvayu ali wrote: > Hi Neal, > > On 7 October 2010 09:10, Neal Becker wrote: >> How do I set ediff to give a unified patch format? >> >> Why is this not the default? >> > > The trick is to look for diff-switches. ;) > > > diff-switches is a variable defined in `diff.el'. > Its value is "-u" > > Documentation: > A string or list of strings specifying switches to be passed to diff. > ediff-custom-diff-options is a variable defined in `ediff-diff.el'. Its value is "-c" (DEFAULT) Documentation: Options to pass to `ediff-custom-diff-program'.