From 2f75a817167d4e96c844190b03d7d92cdce3fb3d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 19 Feb 2017 18:39:54 -0500
Subject: [PATCH] Update modules/feature/version-control

---
 modules/feature/version-control/+git.el     | 35 +++++++++------------
 modules/feature/version-control/autoload.el | 13 +++++---
 modules/feature/version-control/packages.el |  1 -
 modules/ui/doom/config.el                   | 15 +++++++++
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el
index 61dbf4776..3882594cb 100644
--- a/modules/feature/version-control/+git.el
+++ b/modules/feature/version-control/+git.el
@@ -6,32 +6,19 @@
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
 (@def-package gitignore-mode
-  :mode "/\\.?git/?config$"
-  :mode "/\\.gitmodules$")
+  :mode "/\\.gitignore$")
 
 
 (@def-package git-gutter-fringe
   :commands git-gutter-mode
-  :init (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
+  :init
+  (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
   :config
   (@set :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
 
   ;; Update git-gutter on focus (in case I was using git externally)
   (add-hook 'focus-in-hook 'git-gutter:update-all-windows)
 
-  ;; places the git gutter outside the margins.
-  (setq-default fringes-outside-margins t)
-  ;; thin fringe bitmaps
-  (define-fringe-bitmap 'git-gutter-fr:added
-    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
-    nil nil 'center)
-  (define-fringe-bitmap 'git-gutter-fr:modified
-    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
-    nil nil 'center)
-  (define-fringe-bitmap 'git-gutter-fr:deleted
-    [0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248]
-    nil nil 'center)
-
   (@after evil
     ;; Refreshing git-gutter on ESC
     (advice-add 'evil-force-normal-state :after 'git-gutter)))
@@ -44,10 +31,16 @@
 (@def-package magit
   :commands magit-status
   :config
-  (@set :popup "^\\*magit.+" :regexp t)
+  (@set :popup "^\\*magit" :regexp t)
+  (@map :map magit-mode-map
+        ;; Don't interfere with window movement keys
+        :nv "C-j" nil
+        :nv "C-k" nil))
 
-  (@after evil
-    (require 'evil-magit)
-    ;; evil-snipe conflicts with magit
-    (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)))
+
+(@def-package evil-magit
+  :after magit
+  :config
+  ;; evil-snipe conflicts with magit
+  (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode))
 
diff --git a/modules/feature/version-control/autoload.el b/modules/feature/version-control/autoload.el
index c7923765f..1d29ecf9f 100644
--- a/modules/feature/version-control/autoload.el
+++ b/modules/feature/version-control/autoload.el
@@ -3,7 +3,7 @@
 ;;;###autoload
 (defun +vcs-root ()
   "Get git url root."
-  (-when-let (url (car-safe (browse-at-remote--remote-ref buffer-file-name)))
+  (when-let (url (car-safe (browse-at-remote--remote-ref buffer-file-name)))
     (cdr (browse-at-remote--get-url-from-remote url))))
 
 ;;;###autoload
@@ -17,10 +17,13 @@ Fallback to repository root."
       (error
        (setq url (shell-command-to-string "hub browse -u --"))
        (setq url (if url
-                     (concat (s-trim url) "/" (f-relative (buffer-file-name) (doom-project-root))
-                             (when (use-region-p) (format "#L%s-L%s"
-                                                          (line-number-at-pos (region-beginning))
-                                                          (line-number-at-pos (region-end)))))))))
+                     (concat (string-trim url) "/"
+                             (file-relative-name (buffer-file-name)
+                                                 (doom-project-root))
+                             (when (use-region-p)
+                               (format "#L%s-L%s"
+                                       (line-number-at-pos (region-beginning))
+                                       (line-number-at-pos (region-end)))))))))
     (when url (browse-url url))))
 
 ;;;###autoload
diff --git a/modules/feature/version-control/packages.el b/modules/feature/version-control/packages.el
index e4edd0b0e..bd425c235 100644
--- a/modules/feature/version-control/packages.el
+++ b/modules/feature/version-control/packages.el
@@ -10,7 +10,6 @@
 (@package gitconfig-mode)
 (@package gitignore-mode)
 (@package magit)
-
 (when (@featurep :feature evil)
   (@package evil-magit))
 
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 15832d0cf..96d8224d6 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -87,3 +87,18 @@
             (overlay-put
              ov 'display (propertize "  [...]  " 'face 'doom-folded-face))))))
 
+
+;; subtle diff indicators in the fringe
+(@after git-gutter-fringe
+  ;; places the git gutter outside the margins.
+  (setq-default fringes-outside-margins t)
+  ;; thin fringe bitmaps
+  (define-fringe-bitmap 'git-gutter-fr:added
+    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
+    nil nil 'center)
+  (define-fringe-bitmap 'git-gutter-fr:modified
+    [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224]
+    nil nil 'center)
+  (define-fringe-bitmap 'git-gutter-fr:deleted
+    [0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248]
+    nil nil 'center))