From: Amin Bandali Date: Thu, 6 Feb 2020 06:59:06 +0000 (-0500) Subject: emacs: use emacs's own mhtml-mode rather than web-mode, disable typo X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/commitdiff_plain/68b2cdaa7c4c412acb831759fc78f3c0c8844f97 emacs: use emacs's own mhtml-mode rather than web-mode, disable typo --- diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 0233b06..55ca4cd 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1080,7 +1080,8 @@ This function is intended for use with `ivy-ignore-buffers'." (mode . message-mode))) ("web" (or - (mode . web-mode) + ;; (mode . web-mode) + (mode . mhtml-mode) (mode . css-mode) (mode . scss-mode) (mode . js2-mode))) @@ -1417,6 +1418,8 @@ This function is intended for use with `ivy-ignore-buffers'." ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el ) +(use-package mhtml-mode) + (use-package sgml-mode :config (setq sgml-basic-offset 2)) @@ -1426,6 +1429,7 @@ This function is intended for use with `ivy-ignore-buffers'." (setq css-indent-offset 2)) (use-package web-mode + :disabled :mode "\\.html\\'" :config (b/setq-every 2 @@ -1436,13 +1440,13 @@ This function is intended for use with `ivy-ignore-buffers'." (web-mode-enable-auto-indentation nil)) (use-package emmet-mode - :after (:any web-mode css-mode sgml-mode) + :after (:any mhtml-mode css-mode sgml-mode) :bind* (("C-)" . emmet-next-edit-point) ("C-(" . emmet-prev-edit-point)) :config (unbind-key "C-j" emmet-mode-keymap) (setq emmet-move-cursor-between-quotes t) - :hook (web-mode css-mode html-mode sgml-mode)) + :hook (css-mode html-mode mhtml-mode sgml-mode)) (comment (use-package meghanada @@ -1690,12 +1694,6 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c f n" "footnote") (which-key-add-major-mode-key-based-replacements 'org-mode "C-c C-v" "org-babel") - (which-key-add-major-mode-key-based-replacements 'web-mode - "C-c C-a" "web/attributes" - "C-c C-b" "web/blocks" - "C-c C-d" "web/dom" - "C-c C-e" "web/element" - "C-c C-t" "web/tags") (which-key-mode) :custom @@ -1803,9 +1801,10 @@ This function is intended for use with `ivy-ignore-buffers'." ;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹› (use-package typo + :disabled :defer 0.5 :config - :hook (web-mode . typo-mode)) + :hook ((html-mode mhtml-mode) . typo-mode)) (use-package electric :disabled