From 66d309e407d606f9705590ff9f30c0d7a735b89b Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 19 Jul 2024 09:51:59 +1200 Subject: [PATCH] emacs: refactor indent hooks --- .emacs.d/init.el | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index cdd652d..8aedcb2 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -65,23 +65,22 @@ (defun indent-tab-hook () (indent-common-hook) (setq-local indent-tabs-mode t)) -(defun indent-spc-hook () +(defun indent-spc-hook (&optional w) + (or w (setq w 4)) (indent-common-hook) - (setq-local indent-tabs-mode nil)) + (setq-local indent-tabs-mode nil + tab-width w)) (add-hook 'prog-mode-hook 'display-line-numbers-mode) (add-hook 'text-mode-hook 'hl-line-mode) (add-hook 'prog-mode-hook 'indent-tab-hook) (add-hook 'sgml-mode-hook 'indent-spc-hook) -(add-hook 'nix-mode-hook #'(lambda () - (indent-spc-hook) - (setq-local tab-width 2))) +(add-hook 'd-mode-hook 'indent-tab-hook) +(add-hook 'nix-mode-hook #'(lambda () (indent-spc-hook 2))) (defun lisp-hook () - (indent-spc-hook) - (keymap-local-set "C-c l" 'common-lisp-hyperspec) - (setq-local tab-width 2)) + (indent-spc-hook 2)) (add-hook 'lisp-mode-hook 'lisp-hook) (add-hook 'lisp-data-mode-hook 'lisp-hook)