feat(whitespace): re-enable whitespace mode without newline-mark

Turns out the conflicts with both copilot and highlight-indent-guide was
due to the newline-mark. Hence disable newline-mark and re-enable
whitespace mode.
This commit is contained in:
2022-06-20 20:22:35 +01:00
parent daefce3143
commit f319097821
3 changed files with 10 additions and 5 deletions

View File

@@ -26,10 +26,12 @@
:config
(setq whitespace-line-column 80
whitespace-style '(face tabs trailing space-before-tab newline
indentation space-after-tab tab-mark
newline-mark empty)
whitespace-display-mappings '((newline-mark ?\n
whitespace-style '(face tabs spaces trailing space-before-tab newline
indentation space-after-tab tab-mark empty)
whitespace-display-mappings '((space-mark ?\s
[?\u00B7] ;; \u00B7 = ·
[46]) ;; 46 = .
(newline-mark ?\n
[?\u00AC ?\n] ;; \u00AC = ¬
[?$ ?\n])
(tab-mark ?\t

View File

@@ -23,7 +23,8 @@
(if (< (buffer-size) (* 100 1024))
(siren-display-indentation 1))
(hl-line-mode t))
(hl-line-mode t)
(whitespace-mode t))
:init
(add-to-list 'safe-local-variable-values '(fill-column . 120)))

View File

@@ -26,6 +26,8 @@
;; whitespace-mode
`(whitespace-tab ((t ( :foreground ,(doom-color 'base4)
:background ,(doom-color 'bg) ))))
`(trailing-whitespace ((t ( :foregroup ,(doom-color 'base4)
:background ,(doom-color 'red) ))))
;; fill-column-indicator
`(fill-column-indicator ((t ( :foreground ,(doom-lighten 'base3 0.10) ))))