Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Getting vc-diff to use ediff in Emacs 23.2

Had this working well in Emacs 23.1.x but it appears to have broke in the move to Emacs 23.2

I want to use ediff when comparing working copy of a file with SVN HEAD.

Normally I press C-x v = and ediff runs because of the following configuration in my .emacs

;; Use ediff and not diff 
(setq diff-command "ediff")

But, alas I still get the normal vc-diff buffer appearing and no ediff session...

Has anyone else encountered this and know what might be the problem?

like image 202
codeasone Avatar asked Sep 14 '10 20:09

codeasone


1 Answers

Am a bit skeptical that the above setting did what you say it did.

That said, this will bind '=' to use 'ediff-revision:

(eval-after-load "vc-hooks"
         '(define-key vc-prefix-map "=" 'ediff-revision))
like image 199
Trey Jackson Avatar answered Oct 05 '22 14:10

Trey Jackson