bug#7094: 23.1; Feature Request: Ediff integration into VC mode

bug#7094: 23.1; Feature Request: Ediff integration into VC mode

[Schoepflin, Markus]

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=''

bug#7094: 23.1; Feature Request: Ediff integration into VC mode

[Michael Albinus]

Version: 24.1

"Schoepflin, Markus" <Markus.Schoepflin@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.