From dca1fdf180f12a085f53910fdea3dbecdc95e606 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Fri, 26 Oct 2018 14:47:50 +1100 Subject: [PATCH] Switch indent-guide for highlight-indent-guides --- .gitmodules | 6 +++--- lisp/my-minor-modes.el | 11 ++++++----- packages/highlight-indent-guides | 1 + packages/indent-guide | 1 - 4 files changed, 10 insertions(+), 9 deletions(-) create mode 160000 packages/highlight-indent-guides delete mode 160000 packages/indent-guide diff --git a/.gitmodules b/.gitmodules index 49eca88..6fb1086 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,9 +25,6 @@ [submodule "yasnippet"] path = packages/yasnippet url = https://github.com/joaotavora/yasnippet.git -[submodule "indent-guide"] - path = packages/indent-guide - url = https://github.com/zk-phi/indent-guide.git [submodule "expand-region"] path = packages/expand-region url = https://github.com/magnars/expand-region.el.git @@ -145,3 +142,6 @@ [submodule "tide"] path = packages/tide url = https://github.com/ananthakumaran/tide.git +[submodule "highlight-indent-guides"] + path = packages/highlight-indent-guides + url = https://github.com/DarthFennec/highlight-indent-guides.git diff --git a/lisp/my-minor-modes.el b/lisp/my-minor-modes.el index 40de35d..0c994d5 100644 --- a/lisp/my-minor-modes.el +++ b/lisp/my-minor-modes.el @@ -39,6 +39,11 @@ (require 'goto-chg) +(require 'highlight-indent-guides) +(add-hook 'prog-mode-hook 'highlight-indent-guides-mode) +(setq highlight-indent-guides-method 'character) +(setq highlight-indent-guides-responsive 'top) + (require 'highlight-symbol) (add-hook 'prog-mode-hook #'highlight-symbol-mode) (add-hook 'prog-mode-hook #'highlight-symbol-nav-mode) @@ -50,10 +55,6 @@ (require 'hl-todo) (global-hl-todo-mode) -(require 'indent-guide) -(indent-guide-global-mode) -(setq indent-guide-recursive t) - (require 'jump-char) (require 'flyspell) @@ -80,6 +81,6 @@ (diminish 'editorconfig-mode) (diminish 'git-gutter-mode) (diminish 'highlight-symbol-mode) - (diminish 'indent-guide-mode) + (diminish 'highlight-indent-guides-mode) (diminish 'ivy-mode) (diminish 'yas-minor-mode))) diff --git a/packages/highlight-indent-guides b/packages/highlight-indent-guides new file mode 160000 index 0000000..e463564 --- /dev/null +++ b/packages/highlight-indent-guides @@ -0,0 +1 @@ +Subproject commit e46356487d4b19144af3025cf16f1b1bd174a450 diff --git a/packages/indent-guide b/packages/indent-guide deleted file mode 160000 index d64f430..0000000 --- a/packages/indent-guide +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d64f43011c72068e008621e620009ec592b35913 -- 2.39.2