emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui/modeline: correct & refactor indent segment

Browse source 
Incorrectly displayed "auto-detection disabled" when it wasn't.
This commit is contained in:
Henrik Lissner 2019-03-04 17:41:14 -05:00
parent 18017f74f1
commit 9266239a2f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/ui/modeline/config.el
View file

@ -38,21 +38,22 @@
tab-width)
'mouse-face 'mode-line-highlight
'help-echo
(mapconcat #'identity
(list (format "Indentation style: %s (%d wide)"
(if indent-tabs-mode "tabs" "spaces")
tab-width)
(if (eq doom-inhibit-indent-detection 'editorconfig)
(propertize "✓ Editorconfig applied" 'face 'success)
(propertize "✘ Indentation auto-detection disabled" 'face 'warning))
(when (bound-and-true-p ws-butler-mode)
(propertize "✓ ws-butler active (whitespace cleanup on save)"
'face 'success))
(when (bound-and-true-p dtrt-indent-original-indent)
(propertize (format "✓ Indentation auto-detected (original: %s)"
dtrt-indent-original-indent)
'face 'success)))
" ")))
(let ((subsegs
(list (format "Indentation style: %s (%d wide)"
(if indent-tabs-mode "tabs" "spaces")
tab-width)
(cond ((eq doom-inhibit-indent-detection 'editorconfig)
(propertize "✓ Editorconfig applied" 'face 'success))
(doom-inhibit-indent-detection
(propertize "✘ Indentation auto-detection disabled" 'face 'warning))
((bound-and-true-p dtrt-indent-original-indent)
(propertize (format "✓ Indentation auto-detected (original: %s)"
dtrt-indent-original-indent)
'face 'success)))
(when (bound-and-true-p ws-butler-mode)
(propertize "✓ ws-butler active (whitespace cleanup on save)"
'face 'success)))))
(string-join (delq nil subsegs) " "))))
(add-to-list 'doom-modeline-fn-alist '(indent . +modeline-indent-segment))
;; Remove unused segments & extra padding