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: ediff maximum line length? Date: Fri, 11 Feb 2011 09:27:26 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1297434748 16493 80.91.229.12 (11 Feb 2011 14:32:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 11 Feb 2011 14:32:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 11 15:32:23 2011 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.69) (envelope-from ) id 1Pnu2i-0005d9-2z for ged-emacs-devel@m.gmane.org; Fri, 11 Feb 2011 15:32:16 +0100 Original-Received: from localhost ([127.0.0.1]:60954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pnu2h-0008Hn-PC for ged-emacs-devel@m.gmane.org; Fri, 11 Feb 2011 09:32:15 -0500 Original-Received: from [140.186.70.92] (port=45720 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pnty9-0005q9-5U for emacs-devel@gnu.org; Fri, 11 Feb 2011 09:27:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pnty6-0005Kd-4s for emacs-devel@gnu.org; Fri, 11 Feb 2011 09:27:32 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:44380 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pnty5-0005KE-QY for emacs-devel@gnu.org; Fri, 11 Feb 2011 09:27:29 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAIbWVE1FxIyy/2dsb2JhbAClc3S6fYVdBIUBjzk X-IronPort-AV: E=Sophos;i="4.60,455,1291611600"; d="scan'208";a="91324201" Original-Received: from 69-196-140-178.dsl.teksavvy.com (HELO ceviche.home) ([69.196.140.178]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 11 Feb 2011 09:27:27 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id EF087660C9; Fri, 11 Feb 2011 09:27:26 -0500 (EST) In-Reply-To: (Giorgos Keramidas's message of "Fri, 11 Feb 2011 01:02:13 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:135890 Archived-At: > I am looking for something that can compare two files, so that I can > launch Emacs as my diff tool, e.g. from Perforce, Subversion, etc. I > don't know if diff-mode can compare two files instead of a buffer and > its file. diff-mode is not a replacement for ediff in that it only helps you read contextual diffs (i.e. the output of `diff' or other tools that output in the same format). So, if you do exec emacs --eval "(diff \"$1\" \"$2\")" the resulting *diff* buffer will be in diff-mode. > That's why I used ediff. (Another reason is that I know its > key bindings from vc, but that's not something I can't live without.) >From VC, C-x v = will give you a diff that's displayed in diff-mode. For some uses, this is much better than ediff, but for others ediff is more appropriate. I've gotten so used to reading diffs that I don't use ediff nearly as much as diff-mode, tho. > Is it possible to use diff-mode for the same sort of comparison? Yes, see above. Stefan PS: For 3-way "diffs", smerge-mode provides a similar alternative to ediff3, and also supports highlighting of fine diffs. And there's probably a way to get diff3-style output from `diff', so as to use smerge-mode for 2-way comparisons.