From: Amin Bandali Date: Mon, 13 Apr 2020 16:30:27 +0000 (-0400) Subject: Assimilate alloy-mode 0d05bdd X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/commitdiff_plain/fac1032c8088b37252bef5e1e07e03bf1e955c0b Assimilate alloy-mode 0d05bdd And disable flycheck for the time being. --- diff --git a/.gitmodules b/.gitmodules index c500cfb..bee832b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ +[submodule "alloy-mode"] + path = lib/alloy-mode + url = https://github.com/dwwmmn/alloy-mode.git [submodule "amx"] path = lib/amx url = https://github.com/DarwinAwardWinner/amx.git diff --git a/init.el b/init.el index e633282..409beab 100644 --- a/init.el +++ b/init.el @@ -749,8 +749,8 @@ For disabling the behaviour for certain buffers and/or modes." ;; (global-company-mode t) ) -(comment (use-package flycheck + :disabled :defer 0.6 :hook (prog-mode . flycheck-mode) :bind @@ -765,10 +765,11 @@ For disabling the behaviour for certain buffers and/or modes." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-package flyspell) +;; (use-package flyspell) ;; http://endlessparentheses.com/ispell-and-apostrophes.html (use-package ispell + :disabled :defer 0.6 :config ;; ’ can be part of a word @@ -809,28 +810,28 @@ For disabling the behaviour for certain buffers and/or modes." (use-package reveal :hook (emacs-lisp-mode . reveal-mode)) -(use-package elisp-mode) - -;; (use-package alloy-mode -;; :straight (:host github :repo "dwwmmn/alloy-mode") -;; :mode "\\.\\(als\\|dsh\\)\\'" -;; :config -;; (setq alloy-basic-offset 2) -;; ;; (defun b/alloy-simple-indent (start end) -;; ;; (interactive "r") -;; ;; ;; (if (region-active-p) -;; ;; ;; (indent-rigidly start end alloy-basic-offset) -;; ;; ;; (if (bolp) -;; ;; ;; (indent-rigidly (line-beginning-position) -;; ;; ;; (line-end-position) -;; ;; ;; alloy-basic-offset))) -;; ;; (indent-to (+ (current-column) alloy-basic-offset))) -;; :bind (:map alloy-mode-map -;; ("RET" . electric-newline-and-maybe-indent) -;; ;; ("TAB" . b/alloy-simple-indent) -;; ("TAB" . indent-for-tab-command)) -;; :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) +;; (use-package elisp-mode) +(use-package alloy-mode + :mode "\\.\\(als\\|dsh\\)\\'" + :config + (setq alloy-basic-offset 2) + ;; (defun b/alloy-simple-indent (start end) + ;; (interactive "r") + ;; ;; (if (region-active-p) + ;; ;; (indent-rigidly start end alloy-basic-offset) + ;; ;; (if (bolp) + ;; ;; (indent-rigidly (line-beginning-position) + ;; ;; (line-end-position) + ;; ;; alloy-basic-offset))) + ;; (indent-to (+ (current-column) alloy-basic-offset))) + :bind (:map alloy-mode-map + ("RET" . electric-newline-and-maybe-indent) + ;; ("TAB" . b/alloy-simple-indent) + ("TAB" . indent-for-tab-command)) + :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) + +(comment (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode :defer 0.4 @@ -845,7 +846,7 @@ For disabling the behaviour for certain buffers and/or modes." lean-input-user-translations '(("/" "/"))) (lean-input-setup)) -(use-package mhtml-mode) +;; (use-package mhtml-mode) (use-package sgml-mode :config diff --git a/lib/alloy-mode b/lib/alloy-mode new file mode 160000 index 0000000..0d05bdd --- /dev/null +++ b/lib/alloy-mode @@ -0,0 +1 @@ +Subproject commit 0d05bdd10c77ec04c3d61eccf67e68c08284951f