From 6ddcdbf2d242b02af2d56e68a32ed8432497de6d Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Sun, 11 Apr 2021 20:32:09 -0500
Subject: Make introspection easier


diff --git a/init.el b/init.el
index f4971ee..20f1e64 100644
--- a/init.el
+++ b/init.el
@@ -59,7 +59,8 @@
 (require 'bind-key)
 (require 'use-package)
 (require 'diminish)
-(setq use-package-always-ensure t)
+(setq use-package-always-ensure t
+      use-package-hook-name-suffix nil)
 
 (defvar ravi/use-helm-instead-of-ido t
   "Prefer helm to ido")
diff --git a/lisp/ravi-init-appearance.el b/lisp/ravi-init-appearance.el
index e36e70e..bb97a80 100644
--- a/lisp/ravi-init-appearance.el
+++ b/lisp/ravi-init-appearance.el
@@ -127,7 +127,7 @@ Delete all whitespace on a successive key press."
 (use-package syntax-subword
   :init
   (setq syntax-subword-skip-spaces t)
-  :hook (prog-mode . ravi/turn-on-syntax-subword-mode)
+  :hook (prog-mode-hook . ravi/turn-on-syntax-subword-mode)
   :config
   (defun ravi/turn-on-syntax-subword-mode ()
     (interactive)
diff --git a/lisp/ravi-init-insertion.el b/lisp/ravi-init-insertion.el
index 8564e1d..2ba0b96 100644
--- a/lisp/ravi-init-insertion.el
+++ b/lisp/ravi-init-insertion.el
@@ -125,7 +125,7 @@
         (mapc (lambda (dir) (add-to-list 'company-c-headers-path-system dir)) (ravi/get-default-include-paths))))
 
     ;; To do: enable when moving to emacs 26+
-    ;; (use-package company-box :hook (company-mode . company-box-mode) :ensure t)
+    ;; (use-package company-box :hook (company-mode-hook . company-box-mode) :ensure t)
 
     (setq ravi/use-company-box nil)
     (if ravi/use-company-box
@@ -133,7 +133,7 @@
           (use-package all-the-icons)
           (use-package company-box
             :if window-system
-            :hook (company-mode . company-box-mode)
+            :hook (company-mode-hook . company-box-mode)
             :config
             (setq company-box-icons-unknown (all-the-icons-faicon "question-circle" :height 0.8))
 
diff --git a/lisp/ravi-init-lsp.el b/lisp/ravi-init-lsp.el
index dc40c9c..75bb8a0 100644
--- a/lisp/ravi-init-lsp.el
+++ b/lisp/ravi-init-lsp.el
@@ -30,10 +30,10 @@
 (use-package lsp-mode
   :init
   (setq lsp-keymap-prefix "H-l")
-  :hook ((c-mode . lsp-deferred)
-         (c++-mode . lsp-deferred)
+  :hook ((c-mode-hook . lsp-deferred)
+         (c++-mode-hook . lsp-deferred)
          ;; (python-mode . lsp-deferred)
-         (lsp-mode . lsp-enable-which-key-integration))
+         (lsp-mode-hook . lsp-enable-which-key-integration))
   :commands (lsp lsp-deferred)
   :bind (:map lsp-mode-map
               ("M-<RET>" . lsp-execute-code-action)) ; perhaps helm-lsp-code-actions?
diff --git a/lisp/ravi-init-tex.el b/lisp/ravi-init-tex.el
index 7af212a..b8b9b3d 100644
--- a/lisp/ravi-init-tex.el
+++ b/lisp/ravi-init-tex.el
@@ -165,7 +165,7 @@ starting with \\ and followed by a block of text enclosed in {}."
            (add-hook 'TeX-mode-hook 'ravi/company-math-setup)))
 
         (use-package latex-extra
-          :hook (LaTex-mode . latex-extra-mode)
+          :hook (LaTex-mode-hook . latex-extra-mode)
           :diminish latex-extra-mode)
 
         (defun my-LaTeX-mode-init ()
-- 
cgit v0.10.1