From 5849a1fe38ad38d97f843a8389c7beb9474c6262 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 29 Jul 2017 00:27:20 +0200
Subject: [PATCH] Update :feature version-control to support module flags

---
 modules/feature/version-control/config.el   |  9 +++++++--
 modules/feature/version-control/packages.el | 13 +++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/feature/version-control/config.el b/modules/feature/version-control/config.el
index 98db7e1b3..7d9339355 100644
--- a/modules/feature/version-control/config.el
+++ b/modules/feature/version-control/config.el
@@ -1,12 +1,17 @@
 ;;; feature/version-control/config.el -*- lexical-binding: t; -*-
 
+(unless (featurep! -git)
+  (load! +git))
+;; TODO hg support
+;; (unless (featurep! -hg)
+;;   (load! +hg))
+
+;;
 (setq vc-make-backup-files nil)
 
 (defvar +vcs-auto-hydra-smerge t
   "When entering `smerge-mode' automatically open associated hydra.")
 
-(load! +git)
-;; (load! +hg)
 
 (after! vc-annotate
   (set! :popup
diff --git a/modules/feature/version-control/packages.el b/modules/feature/version-control/packages.el
index 43dfb68fe..25c162e88 100644
--- a/modules/feature/version-control/packages.el
+++ b/modules/feature/version-control/packages.el
@@ -5,11 +5,12 @@
 ;; n/a
 
 ;;; +git
-(package! git-gutter-fringe)
-(package! git-link)
-(package! git-timemachine)
-(package! gitconfig-mode)
-(package! gitignore-mode)
-(package! magit)
+(when (featurep! +git)
+  (package! git-gutter-fringe)
+  (package! git-link)
+  (package! git-timemachine)
+  (package! gitconfig-mode)
+  (package! gitignore-mode)
+  (package! magit))
 
 ;;; TODO +hg