refactor(default): move whitespace & tramp config

- tramp-default-method is already set in :emacs tramp.
- Moves the whitespace config to the new whitespace module.

Amend: fbdde6b5f4
Amend: 71eae252ac
This commit is contained in:
Henrik Lissner
2025-09-25 19:03:43 -04:00
parent 1a116f51a9
commit 722a8d3c7a
2 changed files with 24 additions and 30 deletions

View File

@@ -78,36 +78,6 @@
(setq woman-manpath path)))
;;;###package tramp
(unless (featurep :system 'windows)
(setq tramp-default-method "ssh")) ; faster than the default scp
;;;###package whitespace
(add-hook! 'after-change-major-mode-hook :append
(defun +emacs-highlight-non-default-indentation-h ()
"Highlight whitespace at odds with `indent-tabs-mode'.
That is, highlight tabs if `indent-tabs-mode' is `nil', and highlight spaces at
the beginnings of lines if `indent-tabs-mode' is `t'. The purpose is to make
incorrect indentation in the current buffer obvious to you.
Does nothing if `whitespace-mode' or `global-whitespace-mode' is already active
or if the current buffer is read-only or not file-visiting."
(unless (or (eq major-mode 'fundamental-mode)
(bound-and-true-p global-whitespace-mode)
(null buffer-file-name)
buffer-read-only)
(require 'whitespace)
(set (make-local-variable 'whitespace-style)
(cl-union (if indent-tabs-mode
'(indentation)
'(tabs tab-mark))
(when whitespace-mode
(remq 'face whitespace-active-style))))
(cl-pushnew 'face whitespace-style) ; must be first
(whitespace-mode +1))))
;;
;;; Smartparens config

View File

@@ -34,6 +34,30 @@ successfully sets indent_style/indent_size.")
(use-package! whitespace
:defer t
:init
(add-hook! 'after-change-major-mode-hook :append
(defun +emacs-highlight-non-default-indentation-h ()
"Highlight whitespace at odds with `indent-tabs-mode'.
That is, highlight tabs if `indent-tabs-mode' is `nil', and highlight spaces at
the beginnings of lines if `indent-tabs-mode' is `t'. The purpose is to make
incorrect indentation in the current buffer obvious to you.
Does nothing if `whitespace-mode' or `global-whitespace-mode' is already active
or if the current buffer is read-only or not file-visiting."
(unless (or (eq major-mode 'fundamental-mode)
(bound-and-true-p global-whitespace-mode)
(null buffer-file-name)
buffer-read-only)
(require 'whitespace)
(set (make-local-variable 'whitespace-style)
(cl-union (if indent-tabs-mode
'(indentation)
'(tabs tab-mark))
(when whitespace-mode
(remq 'face whitespace-active-style))))
(cl-pushnew 'face whitespace-style) ; must be first
(whitespace-mode +1))))
:config
(setq whitespace-line-column nil
whitespace-style