From d32b136d407f54481993098b90deb6a1ca1b93d4 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Fri, 16 Sep 2022 06:50:26 +0100
Subject: [PATCH] Fix some more defer-related issues

---
 .emacs.d/lisp/init-misc.el |  3 ++-
 .emacs.d/lisp/init-ui.el   | 16 +++++++---------
 .emacs.d/lisp/init-web.el  | 15 ++++-----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.emacs.d/lisp/init-misc.el b/.emacs.d/lisp/init-misc.el
index 035f5f2..107578c 100644
--- a/.emacs.d/lisp/init-misc.el
+++ b/.emacs.d/lisp/init-misc.el
@@ -3,6 +3,7 @@
 ;;; Code:
 
 (use-package exec-path-from-shell
+  :defer 5
   :if (memq window-system '(mac ns))
   :custom
   (exec-path-from-shell-arguments '("-l"))
@@ -11,7 +12,7 @@
 
 (use-package envrc
  :diminish
- :config
+ :init
  (envrc-global-mode))
 
 (use-package restclient
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index e0c0908..d44b90e 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -138,8 +138,12 @@
   (eshell-mode . (lambda () (whitespace-mode -1))))
 
 (use-package volatile-highlights
+  :defer 10
   :diminish
   :config
+  (vhl/define-extension 'undo-tree 'undo-tree-yank 'undo-tree-move)
+  (vhl/install-extension 'undo-tree)
+  :init
   (volatile-highlights-mode t))
 
 (use-package idle-highlight-mode
@@ -163,6 +167,7 @@
   :diminish)
 
 (use-package repeat
+  :defer 5
   :config
   (repeat-mode +1)
   (defvar buffer-repeat-map
@@ -174,23 +179,16 @@
     (put cmd 'repeat-map 'buffer-repeat-map)))
 
 (use-package pulsar
+  :defer 5
   :custom
-  (pulsar-pulse-on-window-change t)
   (pulsar-pulse t)
   (pulsar-iterations 80)
   (pulsar-face 'pulsar-red)
-  (pulsar-pulse-functions '(recenter-top-bottom
-                            move-to-window-line-top-bottom
-                            reposition-window
-                            forward-page
-                            backward-page
-                            scroll-up-command
-                            scroll-down-command))
   :hook
   (isearch-update-post-hook . pulsar-pulse-line)
   (consult-after-jump-hook . pulsar-pulse-line)
   :bind ("C-c c p" . pulsar-pulse-line)
-  :init
+  :config
   (pulsar-global-mode 1))
 
 (provide 'init-ui)
diff --git a/.emacs.d/lisp/init-web.el b/.emacs.d/lisp/init-web.el
index 2a633d3..c89f45d 100644
--- a/.emacs.d/lisp/init-web.el
+++ b/.emacs.d/lisp/init-web.el
@@ -17,16 +17,9 @@
     (sp-local-tag "%" "<% "  " %>")
     (sp-local-tag "=" "<%= " " %>")
     (sp-local-tag "#" "<%# " " %>"))
-  (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.hbs\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.blade\\.php\\'" . web-mode))
+  :init
   (add-to-list 'auto-mode-alist '("\\.jsp\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("/\\(views\\|html\\|theme\\|templates\\)/.*\\.php\\'" . web-mode)))
+  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))
 
 (use-package css-mode
   :custom
@@ -49,7 +42,7 @@
   :hook (html-mode . (lambda () (tagedit-mode 1))))
 
 (use-package js2-mode
-  :config
+  :init
   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
   :custom
   (js-indent-level 2)
@@ -60,7 +53,7 @@
                       (subword-mode +1))))
 
 (use-package mustache-mode
-  :config
+  :init
   (add-to-list 'auto-mode-alist '("\\.mustache\\'" . mustache-mode)))
 
 (provide 'init-web)