From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-15?Q?Markus_Sch=F6pflin?= Newsgroups: gmane.emacs.help Subject: Using VC mode with ediff? Date: Thu, 23 Sep 2010 13:10:01 +0200 Organization: Aioe.org NNTP Server Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1291951103 26334 80.91.229.12 (10 Dec 2010 03:18:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 10 Dec 2010 03:18:23 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Dec 10 04:18:19 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 1PQtUu-0002wa-Fn for geh-help-gnu-emacs@m.gmane.org; Fri, 10 Dec 2010 04:18:19 +0100 Original-Received: from localhost ([127.0.0.1]:38920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQtUr-0000it-A7 for geh-help-gnu-emacs@m.gmane.org; Thu, 09 Dec 2010 22:18:13 -0500 Original-Path: usenet.stanford.edu!goblin3!goblin2!goblin.stu.neva.ru!feeder.erje.net!news.mixmin.net!aioe.org!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 30 Original-NNTP-Posting-Host: hzAn46cwLozSmDBblnAvDQ.user.speranza.aioe.org Original-X-Complaints-To: abuse@aioe.org X-Notice: Filtered by postfilter v. 0.8.2 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2.9) Gecko/20100915 Thunderbird/3.1.4 Original-Xref: usenet.stanford.edu gnu.emacs.help:181442 X-Mailman-Approved-At: Thu, 09 Dec 2010 20:09:11 -0500 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:77259 Archived-At: In the past I have been a happy user PCL-CVS which has an easy way to invoke ediff from the CVS status buffer. As we are now moving to a distributed VC (mercurial) I have switched to use VC mode, assuming that it would provide the same seamless integration of ediff as PCS-CVS does. Currently it looks that my assumption was wrong, and VC mode doesn't provide any support at all for ediff. Is this correct? Searching for a solution to this problem I discovered vc-ediff.el (see http://github.com/smaclennan/dot-xemacs/blob/master/site-packages/lisp/sam/vc-ediff.el) which, along with the following lines in my .emacs, allows me to use "C-x v =" to invoke ediff in a buffer visiting a version controlled file. ---%<--- (require 'vc-ediff) (eval-after-load "vc-hooks" '(define-key vc-prefix-map "=" 'vc-ediff)) --->%--- The problem is, when I invoke vc-ediff in a buffer in VC dir mode, it compares the contents of the VC dir mode buffer with the selected file, which of course isn't very helpful at all. Does anyone know a solution to this problem? Or is there another way to get VC mode and ediff to work together? Thanks for any help, Markus