diff options
| -rw-r--r-- | .emacs | 19 | ||||
| -rw-r--r-- | .emacs-custom.el | 6 |
2 files changed, 18 insertions, 7 deletions
@@ -336,8 +336,6 @@ '(:eval (if (>= text-scale-mode-amount 0) "π" "π")) 'face-remap) (delight 'visual-line-mode nil t) -(delight 'which-key-mode nil 'which-key) -(delight 'whitespace-mode nil 'whitespace) (delight 'with-editor-mode "βΈ" 'with-editor) ;; TODO: Narrow (β, βΆ) @@ -763,5 +761,22 @@ :custom (show-paren-mode t) (show-paren-predicate t)) + +(use-package which-key + :custom + (which-key-idle-delay 0.5) + (which-key-mode t) + :delight) + +(use-package whitespace + :config + (my/setopt + whitespace-style + (my/list-update whitespace-style + nil '(lines missing-newline-at-eof))) + :delight + ;; FIXME: without :demand t, enabling whitespace-mode in a diff + ;; buffer first causes diff-mode's settings to be applied globally. + :demand t) ;;; TODO: decruftify mode-line (e.g. remove superflous parens). diff --git a/.emacs-custom.el b/.emacs-custom.el index 9117690..8d3b619 100644 --- a/.emacs-custom.el +++ b/.emacs-custom.el @@ -56,11 +56,7 @@ '(tool-bar-mode nil) '(truncate-lines t) '(visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow)) - '(what-cursor-show-names t) - '(which-key-idle-delay 0.5) - '(which-key-mode t) - '(whitespace-style - '(face trailing tabs spaces newline empty indentation space-after-tab space-before-tab space-mark tab-mark newline-mark))) + '(what-cursor-show-names t)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. |