From: "Schoepflin, Markus" <Markus.Schoepflin@comsoft.aero>
To: 7094@debbugs.gnu.org
Subject: bug#7094: 23.1; Feature Request: Ediff integration into VC mode
Date: Fri, 24 Sep 2010 11:57:03 +0200 [thread overview]
Message-ID: <C4E6C0F984539D48A2D8914AC8D21E47BC6B87@CSMAIL.cs-nt-domaene.de> (raw)
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=''
next reply other threads:[~2010-09-24 9:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 9:57 Schoepflin, Markus [this message]
2019-10-14 6:09 ` bug#7094: 23.1; Feature Request: Ediff integration into VC mode Michael Albinus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C4E6C0F984539D48A2D8914AC8D21E47BC6B87@CSMAIL.cs-nt-domaene.de \
--to=markus.schoepflin@comsoft.aero \
--cc=7094@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.