From 66cf3de9dc1b89e2e96dae7129b75ecb63bd54c0 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 18 Jul 2022 22:20:08 +0100 Subject: [PATCH] chore(languages): tidy up buffer-local setq statements --- modules/languages/siren-applescript.el | 2 +- modules/languages/siren-coffee.el | 2 +- modules/languages/siren-conf.el | 2 +- modules/languages/siren-css.el | 2 +- modules/languages/siren-cucumber.el | 2 +- modules/languages/siren-emacs-lisp.el | 2 +- modules/languages/siren-groovy.el | 6 +++--- modules/languages/siren-haml.el | 2 +- modules/languages/siren-js.el | 6 +++--- modules/languages/siren-json.el | 6 +++--- modules/languages/siren-lua.el | 4 ++-- modules/languages/siren-makefile.el | 2 +- modules/languages/siren-nginx.el | 2 +- modules/languages/siren-plantuml.el | 2 +- modules/languages/siren-protobuf.el | 3 ++- modules/languages/siren-rust.el | 2 +- modules/languages/siren-sh.el | 3 +-- modules/languages/siren-sql.el | 2 +- modules/languages/siren-ssh-config.el | 2 +- modules/languages/siren-thrift.el | 2 +- modules/languages/siren-toml.el | 2 +- modules/languages/siren-typescript.el | 10 +++++----- modules/languages/siren-web-mode.el | 2 +- modules/languages/siren-xml.el | 2 +- modules/languages/siren-yaml.el | 4 ++-- modules/major-modes/siren-prog-mode.el | 2 +- modules/org-mode/siren-org-mode.el | 14 +++++++------- 27 files changed, 46 insertions(+), 46 deletions(-) diff --git a/modules/languages/siren-applescript.el b/modules/languages/siren-applescript.el index 483fc4e..db7bf7a 100644 --- a/modules/languages/siren-applescript.el +++ b/modules/languages/siren-applescript.el @@ -18,7 +18,7 @@ :preface (defun siren-applescript-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 4) + (setq-local tab-width 4) (highlight-symbol-mode -1) (subword-mode +1))) diff --git a/modules/languages/siren-coffee.el b/modules/languages/siren-coffee.el index ea6dbf9..d25d0e9 100644 --- a/modules/languages/siren-coffee.el +++ b/modules/languages/siren-coffee.el @@ -27,7 +27,7 @@ (file-exists-p (coffee-compiled-file-name (buffer-file-name))) (coffee-cos-mode t)) - (setq tab-width 2) + (setq-local tab-width 2) (subword-mode +1))) (provide 'siren-coffee) diff --git a/modules/languages/siren-conf.el b/modules/languages/siren-conf.el index 693f68b..9abb06b 100644 --- a/modules/languages/siren-conf.el +++ b/modules/languages/siren-conf.el @@ -22,7 +22,7 @@ :preface (defun siren-conf-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2))) + (setq-local tab-width 2))) (provide 'siren-conf) ;;; siren-conf.el ends here diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el index e7e63db..536de58 100644 --- a/modules/languages/siren-css.el +++ b/modules/languages/siren-css.el @@ -22,7 +22,7 @@ :preface (defun siren-css-mode-setup () - (setq tab-width 2) + (setq-local tab-width 2) (tree-sitter-mode +1) (prettier-js-mode) diff --git a/modules/languages/siren-cucumber.el b/modules/languages/siren-cucumber.el index 4cc12c5..2401200 100644 --- a/modules/languages/siren-cucumber.el +++ b/modules/languages/siren-cucumber.el @@ -16,7 +16,7 @@ :preface (defun siren-feature-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2))) + (setq-local tab-width 2))) (provide 'siren-cucumber) ;;; siren-cucumber.el ends here diff --git a/modules/languages/siren-emacs-lisp.el b/modules/languages/siren-emacs-lisp.el index b3a9f07..1ee3307 100644 --- a/modules/languages/siren-emacs-lisp.el +++ b/modules/languages/siren-emacs-lisp.el @@ -27,7 +27,7 @@ ;; (eldoc-mode +1) ;; (siren-recompile-elc-on-save) ;; (rainbow-mode +1) - ;; (setq mode-name "EL") + ;; (setq-local mode-name "EL") ;; (siren-conditional-emacs-lisp-checker) ) diff --git a/modules/languages/siren-groovy.el b/modules/languages/siren-groovy.el index 33f097d..107a8ad 100644 --- a/modules/languages/siren-groovy.el +++ b/modules/languages/siren-groovy.el @@ -13,9 +13,9 @@ :preface (defun siren-groovy-mode-setup () - (setq groovy-highlight-assignments t - groovy-indent-offset 4 - tab-width 4) + (setq-local groovy-highlight-assignments t + groovy-indent-offset 4 + tab-width 4) (subword-mode +1))) diff --git a/modules/languages/siren-haml.el b/modules/languages/siren-haml.el index ab6e19c..898d519 100644 --- a/modules/languages/siren-haml.el +++ b/modules/languages/siren-haml.el @@ -12,7 +12,7 @@ :preface (defun siren-haml-mode-setup () - (setq tab-width 2))) + (setq-local tab-width 2))) (provide 'siren-haml) ;;; siren-haml.el ends here diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el index fc49c29..c10b13a 100644 --- a/modules/languages/siren-js.el +++ b/modules/languages/siren-js.el @@ -28,9 +28,9 @@ (defun siren-js-mode-setup () "Default tweaks for `js-mode'." (let ((width 2)) - (setq js-indent-level width - indent-level width - tab-width width)) + (setq-local js-indent-level width + indent-level width + tab-width width)) (tree-sitter-mode +1) (subword-mode) diff --git a/modules/languages/siren-json.el b/modules/languages/siren-json.el index 3e3569d..a5153e2 100644 --- a/modules/languages/siren-json.el +++ b/modules/languages/siren-json.el @@ -27,9 +27,9 @@ "Default tweaks for `json-mode'." (let ((width 2)) - (setq js-indent-level width - json-reformat:indent-width width - tab-width width)) + (setq-local js-indent-level width + json-reformat:indent-width width + tab-width width)) (tree-sitter-mode +1))) diff --git a/modules/languages/siren-lua.el b/modules/languages/siren-lua.el index 37b8b30..3d6f43d 100644 --- a/modules/languages/siren-lua.el +++ b/modules/languages/siren-lua.el @@ -12,8 +12,8 @@ :preface (defun siren-lua-mode-setup () - (setq lua-indent-level 2 - whitespace-action '(auto-cleanup)) + (setq-local lua-indent-level 2 + whitespace-action '(auto-cleanup)) (subword-mode +1))) diff --git a/modules/languages/siren-makefile.el b/modules/languages/siren-makefile.el index ee00c04..311b387 100644 --- a/modules/languages/siren-makefile.el +++ b/modules/languages/siren-makefile.el @@ -22,7 +22,7 @@ (defun siren-makefile-mode-setup () (subword-mode +1) (siren-display-indentation -1) - (setq tab-width 4)) + (setq-local tab-width 4)) :init (add-to-list 'siren-indent-sensitive-modes 'makefile-mode)) diff --git a/modules/languages/siren-nginx.el b/modules/languages/siren-nginx.el index 56ab431..ec95794 100644 --- a/modules/languages/siren-nginx.el +++ b/modules/languages/siren-nginx.el @@ -16,7 +16,7 @@ :preface (defun siren-nginx-mode-setup () - (setq tab-width 4))) + (setq-local tab-width 4))) (use-package company-nginx :hook diff --git a/modules/languages/siren-plantuml.el b/modules/languages/siren-plantuml.el index 5f890c6..adb6195 100644 --- a/modules/languages/siren-plantuml.el +++ b/modules/languages/siren-plantuml.el @@ -16,7 +16,7 @@ :preface (defun siren-plantuml-mode-setup () - (setq tab-width 2))) + (setq-local tab-width 2))) (provide 'siren-plantuml) ;;; siren-plantuml.el ends here diff --git a/modules/languages/siren-protobuf.el b/modules/languages/siren-protobuf.el index 0a4e5ea..ea164c0 100644 --- a/modules/languages/siren-protobuf.el +++ b/modules/languages/siren-protobuf.el @@ -19,7 +19,8 @@ :preface (defun siren-protobuf-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2) + (setq-local tab-width 2) + (c-add-style "siren" '((c-basic-offset . 2) (indent-tabs-mode . nil)) t) diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el index d01127f..eae9398 100644 --- a/modules/languages/siren-rust.el +++ b/modules/languages/siren-rust.el @@ -23,7 +23,7 @@ :preface (defun siren-rust-mode-setup () - (setq rust-format-on-save t) + (setq-local rust-format-on-save t) (tree-sitter-mode +1) (lsp-deferred) diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el index 4cb3c28..4367696 100644 --- a/modules/languages/siren-sh.el +++ b/modules/languages/siren-sh.el @@ -36,8 +36,7 @@ :preface (defun siren-sh-mode-setup () - (setq tab-width 2 - whitespace-action '(auto-cleanup)) + (setq-local tab-width 2) (subword-mode +1) (tree-sitter-mode +1))) diff --git a/modules/languages/siren-sql.el b/modules/languages/siren-sql.el index 9adb06c..49ada14 100644 --- a/modules/languages/siren-sql.el +++ b/modules/languages/siren-sql.el @@ -15,7 +15,7 @@ :preface (defun siren-sql-mode-setup () - (setq tab-width 2))) + (setq-local tab-width 2))) (use-package lsp-sqls :straight lsp-mode diff --git a/modules/languages/siren-ssh-config.el b/modules/languages/siren-ssh-config.el index 5e44a9e..69841ba 100644 --- a/modules/languages/siren-ssh-config.el +++ b/modules/languages/siren-ssh-config.el @@ -16,7 +16,7 @@ :preface (defun siren-ssh-config-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2))) + (setq-local tab-width 2))) (provide 'siren-ssh-config) ;;; siren-ssh-config.el ends here diff --git a/modules/languages/siren-thrift.el b/modules/languages/siren-thrift.el index 9e11f79..b016900 100644 --- a/modules/languages/siren-thrift.el +++ b/modules/languages/siren-thrift.el @@ -15,7 +15,7 @@ :preface (defun siren-thrift-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2) + (setq-local tab-width 2) (subword-mode +1))) diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el index 1d5a14b..b1790f8 100644 --- a/modules/languages/siren-toml.el +++ b/modules/languages/siren-toml.el @@ -17,7 +17,7 @@ :preface (defun siren-toml-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2) + (setq-local tab-width 2) (prettier-js-mode))) (provide 'siren-toml) diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el index 056f3ef..22a63e3 100644 --- a/modules/languages/siren-typescript.el +++ b/modules/languages/siren-typescript.el @@ -27,9 +27,9 @@ :preface (defun siren-typescript-mode-setup () (let ((width 2)) - (setq typescript-indent-level width - indent-level width - tab-width width)) + (setq-local typescript-indent-level width + indent-level width + tab-width width)) (lsp-deferred) (subword-mode +1) @@ -49,8 +49,8 @@ (interactive) (tide-setup) - (setq flycheck-check-syntax-automatically '(save mode-enabled) - company-tooltip-align-annotations t) + (setq-local flycheck-check-syntax-automatically '(save mode-enabled) + company-tooltip-align-annotations t) (tree-sitter-mode +1) (prettier-js-mode +1) diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el index 7ff9735..ad450f8 100644 --- a/modules/languages/siren-web-mode.el +++ b/modules/languages/siren-web-mode.el @@ -34,7 +34,7 @@ :preface (defun siren-web-mode-setup () "Default tweaks for `web-mode'." - (setq tab-width 2) + (setq-local tab-width 2) (when (version< emacs-version "27.0") (siren-display-fill-column -1)) diff --git a/modules/languages/siren-xml.el b/modules/languages/siren-xml.el index 763cf05..97486ae 100644 --- a/modules/languages/siren-xml.el +++ b/modules/languages/siren-xml.el @@ -21,7 +21,7 @@ :preface (defun siren-xml-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2) + (setq-local tab-width 2) (prettier-js-mode))) (provide 'siren-xml) diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el index 81ec8d5..800e6d3 100644 --- a/modules/languages/siren-yaml.el +++ b/modules/languages/siren-yaml.el @@ -22,8 +22,8 @@ (defun siren-yaml-mode-setup () (run-hooks 'prog-mode-hook) - (setq tab-width 2) - (subword-mode +1))) + (setq-local tab-width 2) + (subword-mode t))) (use-package lsp-yaml :straight lsp-mode diff --git a/modules/major-modes/siren-prog-mode.el b/modules/major-modes/siren-prog-mode.el index fc2d4e2..0410849 100644 --- a/modules/major-modes/siren-prog-mode.el +++ b/modules/major-modes/siren-prog-mode.el @@ -20,7 +20,7 @@ ;; Highlight indentation if we are not indenting with real tabs. (if (not indent-tabs-mode) - (siren-display-indentation 1)) + (siren-display-indentation t)) (hl-line-mode t) (whitespace-mode t)) diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el index 40a5748..6ab8fef 100644 --- a/modules/org-mode/siren-org-mode.el +++ b/modules/org-mode/siren-org-mode.el @@ -89,13 +89,13 @@ org-emphasis-regexp-components) (auto-fill-mode t) - (siren-display-fill-column) - (siren-display-indentation) - (siren-display-line-numbers) - (flyspell-mode) - (smartparens-mode +1) - (visual-line-mode +1) - (whitespace-mode +1)) + (siren-display-fill-column t) + (siren-display-indentation t) + (siren-display-line-numbers t) + (flyspell-mode t) + (smartparens-mode t) + (visual-line-mode t) + (whitespace-mode t)) :config (require 'org-mouse)