Merge remote branches 'ponder' and 'crybaby'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index fe58c97421423e86f8bf9eaab4e9424dd283fe61..2a7796a6b09479800ec4f0bf40fc353b4a5fbe72 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -55,6 +55,7 @@
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (not (memq 'Git vc-handled-backends))
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (not (memq 'Git vc-handled-backends))

+     (not (memq 'git vc-handled-backends))

      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (trap (or mdw-fast-startup (require 'p4)))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (trap (or mdw-fast-startup (require 'p4)))