TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Turn off treemacs' minor modes when they are configured to be disabled.

Browse source 
The various minor modes are enabled by default, so they must be turned off
explicitly.
This commit is contained in:
Alexander Miller 2019-09-19 06:54:57 +02:00 committed by duianto
parent e17008ec2f
commit 1fae31b56d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.develop
View file

@ -2684,6 +2684,8 @@ Other:
(thanks to duianto) (thanks to duianto)
- Handle ~SPC p t~ when =projectile-project-root= is nil (thanks to Trapez - Handle ~SPC p t~ when =projectile-project-root= is nil (thanks to Trapez
Breen) Breen)
- Made sure treemacs' minor modes will be disabled when they are configured
to be off.
**** Typescript **** Typescript
- Call tsfmt with extension of current buffer for TSX formatting - Call tsfmt with extension of current buffer for TSX formatting
(thanks to Victor Andrée) (thanks to Victor Andrée)

17
layers/+filetree/treemacs/packages.el
View file

@ -63,12 +63,17 @@
:config :config
(progn (progn
(spacemacs/define-evil-state-face "treemacs" "MediumPurple1") (spacemacs/define-evil-state-face "treemacs" "MediumPurple1")
(when treemacs-use-follow-mode ;; minor modes are enabled by default, so they must be explicitly
(treemacs-follow-mode t)) ;; turned off
(when treemacs-use-filewatch-mode (if treemacs-use-follow-mode
(treemacs-filewatch-mode t)) (treemacs-follow-mode t)
(when (memq treemacs-use-git-mode '(simple extended deferred)) (treemacs-follow-mode -1))
(treemacs-git-mode treemacs-use-git-mode)) (if treemacs-use-filewatch-mode
(treemacs-filewatch-mode t)
(treemacs-filewatch-mode -1))
(if (memq treemacs-use-git-mode '(simple extended deferred))
(treemacs-git-mode treemacs-use-git-mode)
(treemacs-git-mode -1))
(add-to-list 'spacemacs-window-split-ignore-prefixes (add-to-list 'spacemacs-window-split-ignore-prefixes
treemacs--buffer-name-prefix)))) treemacs--buffer-name-prefix))))