emacs: Make sure Git is first in the list of VC backends.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 13 Feb 2007 23:43:34 +0000 (23:43 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 13 Feb 2007 23:43:34 +0000 (23:43 +0000)
This way, when there's a conflict (e.g., with gcvs) the right version
control system will win.

emacs

diff --git a/emacs b/emacs
index 88c181a..e71b23b 100644 (file)
--- a/emacs
+++ b/emacs
@@ -41,7 +41,7 @@
 (maybe-autoload 'git-status "git" nil t)
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
-     (setq vc-handled-backends (append vc-handled-backends (list 'GIT))))
+     (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 (and (library-exists-p "quilt")
      (load "quilt"))