From 8d586b3547c169ced30f641d117ac98151222a84 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 23 Jul 2015 01:34:05 +0200 Subject: [PATCH] Fix whitespace-mode settings --- core/core-editor.el | 8 ++++++-- private/themes/narf/narf-dark-theme.el | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index 3b9b318e6..288744344 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -20,9 +20,10 @@ shift-select-mode nil - whitespace-style '(trailing face tabs tab-mark) + tabify-regexp "^\t* [ \t]+" + whitespace-style '(face trailing tabs tab-mark newline newline-mark) whitespace-display-mappings - '((tab-mark ?\t [?| ?\t] [?\\ ?\t]) + '((tab-mark ?\t [?\u2502 ?\t] [?\\ ?\t]) (newline-mark 10 [36 10])) truncate-lines t ; do not soft-wrap lines @@ -89,6 +90,9 @@ (global-auto-revert-mode 1) ; revert buffers for changed files (electric-indent-mode -1) +;; (add-hook! prog-mode 'whitespace-mode) +;; (add-hook! emacs-lisp-mode 'whitespace-mode) + ;; window config undo/redo (setq winner-dont-bind-my-keys t) (winner-mode 1) diff --git a/private/themes/narf/narf-dark-theme.el b/private/themes/narf/narf-dark-theme.el index a60813ec9..36c62420e 100644 --- a/private/themes/narf/narf-dark-theme.el +++ b/private/themes/narf/narf-dark-theme.el @@ -84,8 +84,8 @@ `(font-lock-doc-face ((t (:foreground ,comments)))) `(trailing-whitespace ((t (:background "#884444")))) - `(whitespace-tab ((t (:foreground "#444444")))) - `(whitespace-newline ((t (:foreground "#444444")))) + `(whitespace-tab ((t (:foreground ,line-hl)))) + `(whitespace-newline ((t (:foreground ,line-hl)))) `(whitespace-trailing ((t (:background "#553333")))) `(highlight-indentation-face ((t (:background "#2f3641"))))