GNU bug report logs - #7094
23.1; Feature Request: Ediff integration into VC mode

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 7094 in the body.
You can then email your comments to 7094 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Schoepflin, Markus" <Markus.Schoepflin <at> comsoft.aero>
To: <bug-gnu-emacs <at> gnu.org>
Subject: 23.1; Feature Request: Ediff integration into VC mode
Date: Fri, 24 Sep 2010 11:57:03 +0200

Moving from PCL-CVS mode to VC mode I discovered that there seems to be
no
integration of Ediff into VC mode.

Searching around the Inet turned up 'vc-ediff.el' which along with some
twiddling in my .emacs results in using ediff when invoking "C-x v =" in
a
buffer visiting a version controlled file.

Unfortunately it does not do the right thing in VC dir mode, there it
compares
the contents of the VC dir mode buffer with the selected file, which is
of
course not very helpful at all.

After my inquiry on gnu.emacs.help I was asked to raise a feature
request for
the integration of Ediff into VC mode.

IMHO the easiest thing for the user would be a configuration option for
VC
mode where either regular diff or ediff can be chosen to be used, when
invoking the diff command in either VC dir mode or in regular VC mode.


In GNU Emacs 23.1.1 (i486-pc-linux-gnu, GTK+ Version 2.20.0)
 of 2010-03-29 on rothera, modified by Debian
Windowing system distributor `The X.Org Foundation', version
11.0.10706000
configured using `configure  '--build=i486-linux-gnu'
'--host=i486-linux-gnu' '-
-prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib'
'--localstated
ir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man'
'--with-pop=y
es'
'--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/2
3.1/
site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.1/site-li
sp:/usr/
share/emacs/site-lisp:/usr/share/emacs/23.1/leim' '--with-x=yes'
'--with-x-toolk
it=gtk' '--with-toolkit-scroll-bars' 'build_alias=i486-linux-gnu'
'host_alias=i4
86-linux-gnu' 'CFLAGS=-DDEBIAN -g -O2' 'LDFLAGS=-g' 'CPPFLAGS=''

Message #10 received at 7094-done <at> debbugs.gnu.org (full text, mbox):

From: Michael Albinus <michael.albinus <at> gmx.de>
To: "Schoepflin\, Markus" <Markus.Schoepflin <at> comsoft.aero>
Cc: 7094-done <at> debbugs.gnu.org
Subject: Re: bug#7094: 23.1; Feature Request: Ediff integration into VC mode
Date: Mon, 14 Oct 2019 08:09:57 +0200

Version: 24.1

"Schoepflin, Markus" <Markus.Schoepflin <at> comsoft.aero> writes:

Hi Markus,

I'm going through old bugs. Unfortunately, this bug report didn't get an
answer yet.

> Moving from PCL-CVS mode to VC mode I discovered that there seems to be
> no
> integration of Ediff into VC mode.
>
> Searching around the Inet turned up 'vc-ediff.el' which along with some
> twiddling in my .emacs results in using ediff when invoking "C-x v =" in
> a
> buffer visiting a version controlled file.
>
> Unfortunately it does not do the right thing in VC dir mode, there it
> compares
> the contents of the VC dir mode buffer with the selected file, which is
> of
> course not very helpful at all.
>
> After my inquiry on gnu.emacs.help I was asked to raise a feature
> request for
> the integration of Ediff into VC mode.
>
> IMHO the easiest thing for the user would be a configuration option for
> VC
> mode where either regular diff or ediff can be chosen to be used, when
> invoking the diff command in either VC dir mode or in regular VC mode.

In Emacs 24, a new function `vc-ediff' has been added. It is intended as
alternative to `vc-diff', and it works also in `vc-dir' buffers.

Therefore, your request has been solved. I'm closing this bug
report. Feel free to come back if there are open questions.

Best regards, Michael.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.