diff --git a/core/core-editor.el b/core/core-editor.el index 48048e34c..0da93af36 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -226,7 +226,7 @@ savehist file." (add-hook! '(change-major-mode-after-body-hook read-only-mode-hook) #'doom|detect-indentation) :config - (setq dtrt-indent-verbosity (if doom-debug-mode 2 0)) + (setq dtrt-indent-verbosity (if doom-debug-mode 2 1)) ;; always keep tab-width up-to-date (push '(t tab-width) dtrt-indent-hook-generic-mapping-list) diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el index 1ad7cef13..e3800826a 100644 --- a/modules/ui/modeline/config.el +++ b/modules/ui/modeline/config.el @@ -51,39 +51,10 @@ (hide-mode-line-mode))) (add-hook 'magit-mode-hook #'+modeline|hide-in-non-status-buffer) - ;; Show indentation style in modeline. I'm not using - ;; `doom-modeline-def-segment' to prevent eager macro expansion from loading - ;; the package too soon. - (defun +modeline-indent-segment () - "indent modeline segment" - (propertize (format "%s%d" - (if indent-tabs-mode "⭾" "␣") - tab-width) - 'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive) - 'mouse-face 'mode-line-highlight - 'help-echo - (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 (doom-modeline-def-modeline 'main '(bar window-number matches buffer-info remote-host buffer-position selection-info) - '(misc-info persp-name irc mu4e github debug indent input-method buffer-encoding lsp major-mode process vcs checker)) + '(misc-info persp-name irc mu4e github debug input-method buffer-encoding lsp major-mode process vcs checker)) (doom-modeline-def-modeline 'special '(bar window-number matches buffer-info-simple buffer-position selection-info)