From 10d2dce0beef5990a62b84af5ea166b3703bb4e2 Mon Sep 17 00:00:00 2001
From: ralesi <scio62@gmail.com>
Date: Wed, 18 May 2016 22:21:01 -0700
Subject: [PATCH] Fixes #6051, checks for existance of git-gutter.

---
 layers/+source-control/version-control/funcs.el    | 4 ++--
 layers/+source-control/version-control/packages.el | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layers/+source-control/version-control/funcs.el b/layers/+source-control/version-control/funcs.el
index 245423630..50f936f00 100644
--- a/layers/+source-control/version-control/funcs.el
+++ b/layers/+source-control/version-control/funcs.el
@@ -100,8 +100,8 @@
   (interactive)
   (cl-case version-control-diff-tool
     (diff-hl     diff-hl-mode)
-    (git-gutter  git-gutter-mode)
-    (git-gutter+ git-gutter+-mode)))
+    (git-gutter  (bound-and-true-p git-gutter-mode))
+    (git-gutter+ (bound-and-true-p git-gutter+-mode))))
 
 (defun version-control/margin-global-p ()
   (interactive)
diff --git a/layers/+source-control/version-control/packages.el b/layers/+source-control/version-control/packages.el
index fecb26bcd..e495ee3f4 100644
--- a/layers/+source-control/version-control/packages.el
+++ b/layers/+source-control/version-control/packages.el
@@ -46,7 +46,7 @@
 
 (defun version-control/init-git-gutter ()
   (use-package git-gutter
-    :commands global-git-gutter-mode
+    :commands (global-git-gutter-mode git-gutter-mode)
     :init
     (progn
       ;; If you enable global minor mode
@@ -105,7 +105,7 @@
 
 (defun version-control/init-git-gutter+ ()
   (use-package git-gutter+
-    :commands global-git-gutter+-mode
+    :commands (global-git-gutter+-mode git-gutter+-mode)
     :init
     (progn
       ;; If you enable global minor mode