From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Schoepflin, Markus" Newsgroups: gmane.emacs.bugs Subject: bug#7094: 23.1; Feature Request: Ediff integration into VC mode Date: Fri, 24 Sep 2010 11:57:03 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1285344444 30545 80.91.229.12 (24 Sep 2010 16:07:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 24 Sep 2010 16:07:24 +0000 (UTC) To: 7094@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Sep 24 18:07:23 2010 Return-path: Envelope-to: geb-bug-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 1OzAnm-0007Bq-Ou for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Sep 2010 18:07:22 +0200 Original-Received: from localhost ([127.0.0.1]:33238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OzAni-0005ei-I3 for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Sep 2010 12:07:06 -0400 Original-Received: from [140.186.70.92] (port=54830 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oz6BP-0002ik-KB for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 07:11:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oz6BJ-0002El-U5 for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 07:11:15 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55437) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz6BJ-0002Eh-QY for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 07:11:09 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Oz5j7-0003rX-Ve; Fri, 24 Sep 2010 06:42:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Schoepflin, Markus" Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Sep 2010 10:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 7094 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: Original-Received: via spool by submit@debbugs.gnu.org id=B.128532491814833 (code B ref -1); Fri, 24 Sep 2010 10:42:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Sep 2010 10:41:58 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz5j2-0003rC-Rh for submit@debbugs.gnu.org; Fri, 24 Sep 2010 06:41:57 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz4zH-0003Wk-Gb for submit@debbugs.gnu.org; Fri, 24 Sep 2010 05:54:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oz51q-00083D-2U for submit@debbugs.gnu.org; Fri, 24 Sep 2010 05:57:19 -0400 Original-Received: from lists.gnu.org ([199.232.76.165]:47381) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz51q-000838-0T for submit@debbugs.gnu.org; Fri, 24 Sep 2010 05:57:18 -0400 Original-Received: from [140.186.70.92] (port=55987 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oz51o-0006FA-O3 for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 05:57:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oz51n-00082M-GO for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 05:57:16 -0400 Original-Received: from smtp2.eu ([195.34.176.148]:49542) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz51n-00080t-7f for bug-gnu-emacs@gnu.org; Fri, 24 Sep 2010 05:57:15 -0400 Original-Received: from cspop2.comsoft.de (cspop2.comsoft.de [188.111.50.3]) by smtp2.eu (8.14.3/8.14.3/Debian-5+lenny1) with SMTP id o8O9v9GW020458 for ; Fri, 24 Sep 2010 11:57:10 +0200 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: 23.1; Feature Request: Ediff integration into VC mode Thread-Index: ActbztYs18qUJyiwSU2Vpmeu3DKLqw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Mailman-Approved-At: Fri, 24 Sep 2010 06:41:55 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 24 Sep 2010 06:42:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Mailman-Approved-At: Fri, 24 Sep 2010 12:04:32 -0400 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:40394 Archived-At: 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 =3D" = 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=3Di486-linux-gnu' '--host=3Di486-linux-gnu' '- -prefix=3D/usr' '--sharedstatedir=3D/var/lib' '--libexecdir=3D/usr/lib' '--localstated ir=3D/var/lib' '--infodir=3D/usr/share/info' '--mandir=3D/usr/share/man' '--with-pop=3Dy es' '--enable-locallisppath=3D/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=3Dyes' '--with-x-toolk it=3Dgtk' '--with-toolkit-scroll-bars' 'build_alias=3Di486-linux-gnu' 'host_alias=3Di4 86-linux-gnu' 'CFLAGS=3D-DDEBIAN -g -O2' 'LDFLAGS=3D-g' 'CPPFLAGS=3D''