From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: ediff output Date: Wed, 13 Dec 2006 10:45:28 -0500 Message-ID: References: NNTP-Posting-Host: dough.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1166028067 8556 80.91.229.10 (13 Dec 2006 16:41:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 13 Dec 2006 16:41:07 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Dec 13 17:41:07 2006 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by dough.gmane.org with esmtp (Exim 4.50) id 1GuXAG-0002x0-Bm for geh-help-gnu-emacs@m.gmane.org; Wed, 13 Dec 2006 17:41:04 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GuXAF-0007IW-Rp for geh-help-gnu-emacs@m.gmane.org; Wed, 13 Dec 2006 11:41:03 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews.google.com!news4.google.com!border1.nntp.dca.giganews.com!nntp.giganews.com!local01.nntp.dca.giganews.com!nntp.umontreal.ca!news.umontreal.ca.POSTED!not-for-mail Original-NNTP-Posting-Date: Wed, 13 Dec 2006 09:45:35 -0600 Original-Newsgroups: gnu.emacs.help User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.91 (gnu/linux) Cancel-Lock: sha1:BzAbBfWQgPZOcbhxUTkN7Sr26lQ= Original-Lines: 29 Original-NNTP-Posting-Host: 132.204.27.213 Original-X-Trace: sv3-p8qkY0iDEOOteAsLQUZbuGiCj6l1CJotxdKZFJxQhjSuZmPCxURpku8topOySzxVrWtJw5fueP0SEfY!7t2RoOD2iHs1idlrL+Hng4dUuBU+UaOIr/GB/VUSmhY3AcLRHqyNMt8Nrd42AkpSYsd+7PKytwow!DFtXEO/R5iVqQ/5kSw== Original-X-Complaints-To: abuse@umontreal.ca X-DMCA-Complaints-To: abuse@umontreal.ca X-Abuse-and-DMCA-Info: Please be sure to forward a copy of ALL headers X-Abuse-and-DMCA-Info: Otherwise we will be unable to process your complaint properly X-Postfilter: 1.3.32 Original-Xref: shelby.stanford.edu gnu.emacs.help:143908 Original-To: help-gnu-emacs@gnu.org 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:39512 Archived-At: > I like the difference output to be in the format as: > +++ /tmp/buffer-content-3035240a > @@ -1669,22 +1669,25 @@ > Due to some yet unresolved reason, global function `iswitchb-mode' > needs to be active for this function to work." > (interactive "P") > - (eval-and-compile > + (eval-when-compile > So I set ediff-diff-options to "-u". However typing `D' in ediff panel > still generate the output in a format like: > *** 1669,22 **** > ! (eval-and-compile) > --- 1669,25 ---- > ! (eval-when-compile) > Any ideas? There's a bug in the docstring of ediff-diff-options: it only mentions "-c" as not allowed, but -u is not allowed either IIUC. These options are those used internally by ediff to compute the highlighting and things like that. The options that affect the display of patches are configured in another variable. I believe it's ediff-custom-diff-options. Stefan