 
 ;; Let auto-revert-mode update vc/git info.
 ;; Need it for mode-line-format to stay up to date.
-;; Setting to nil on Emacs 25 for now.
 ;; See https://github.com/magit/magit/wiki/magit-update-uncommitted-buffer-hook
 ;; See https://github.com/magit/magit/blob/master/Documentation/magit.org#the-mode-line-information-isnt-always-up-to-date
-(setq auto-revert-check-vc-info nil)
-;; Setting to nil on Emacs 25 for now.
-;; See https://github.com/magit/magit/wiki/magit-update-uncommitted-buffer-hook
-;; See https://github.com/magit/magit/blob/master/Documentation/magit.org#the-mode-line-information-isnt-always-up-to-date
-(setq vc-handled-backends nil)
+(setq auto-revert-check-vc-info t)
+(setq vc-handled-backends '(Git))
 
 (use-package expand-region :ensure t
   :bind ("C-c w" . er/expand-region))

  :config
  (add-hook 'go-mode-hook #'ar/go-mode-hook-function))

(use-package golint :ensure t)

;; From http://endlessparentheses.com/faster-pop-to-mark-command.html?source=rss

(defun ar/go-mode-hook-function ()
  "Called when entering `go-mode'."
  (helm-dash-activate-docset "Go")
  (setq gofmt-command "goimports")
  (setq-local company-backends '(company-go))
  (company-mode)
  (go-eldoc-setup)
