From 9cb4c8b6371259d73ab096b6b1902d8f0e0aa0c0 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Mon, 25 Jul 2022 18:12:03 +0200
Subject: [PATCH] fix(:lang): ensure lsp! is always appended to hooks

---
 modules/lang/cc/config.el      | 2 +-
 modules/lang/clojure/config.el | 7 ++++---
 modules/lang/idris/config.el   | 2 +-
 modules/lang/latex/config.el   | 2 +-
 modules/lang/ocaml/config.el   | 5 +++--
 modules/lang/web/+css.el       | 2 +-
 modules/lang/web/+html.el      | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index dc5361bc2..ec719c6b6 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -240,7 +240,7 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
                c++-mode-local-vars-hook
                objc-mode-local-vars-hook
                cmake-mode-local-vars-hook)
-             #'lsp!)
+             :append #'lsp!)
 
   (map! :after ccls
         :map (c-mode-map c++-mode-map)
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index c47278042..e88e3ee40 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -18,9 +18,10 @@
     (add-hook! '(clojure-mode-local-vars-hook
                  clojurec-mode-local-vars-hook
                  clojurescript-mode-local-vars-hook)
-      (defun +clojure-disable-lsp-indentation-h ()
-        (setq-local lsp-enable-indentation nil))
-      #'lsp!)
+               :append
+               (defun +clojure-disable-lsp-indentation-h ()
+                 (setq-local lsp-enable-indentation nil))
+               #'lsp!)
     (after! lsp-clojure
       (dolist (m '(clojure-mode
                    clojurec-mode
diff --git a/modules/lang/idris/config.el b/modules/lang/idris/config.el
index a26ad10f1..f9e3f7bd2 100644
--- a/modules/lang/idris/config.el
+++ b/modules/lang/idris/config.el
@@ -3,7 +3,7 @@
 (after! idris-mode
   (add-hook 'idris-mode-hook #'turn-on-idris-simple-indent)
   (when (featurep! +lsp)
-    (add-hook 'idris-mode-hook #'lsp!))
+    (add-hook 'idris-mode-hook #'lsp! 'append))
   (set-repl-handler! 'idris-mode 'idris-pop-to-repl)
   (set-lookup-handlers! 'idris-mode
     :documentation #'idris-docs-at-point)
diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el
index 6b896b86f..4b924d619 100644
--- a/modules/lang/latex/config.el
+++ b/modules/lang/latex/config.el
@@ -101,7 +101,7 @@ If no viewer is found, `latex-preview-pane-mode' is used.")
   (when (featurep! +lsp)
     (add-hook! '(tex-mode-local-vars-hook
                  latex-mode-local-vars-hook)
-               #'lsp!))
+               :append #'lsp!))
   (map! :localleader
         :map latex-mode-map
         :desc "View"          "v" #'TeX-view
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index 001428d3f..2fc87cd36 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -4,8 +4,9 @@
 ;;; Packages
 
 (when (featurep! +lsp)
-  (add-hook! '(tuareg-mode-local-vars-hook reason-mode-local-vars-hook)
-             #'lsp!))
+  (add-hook! '(tuareg-mode-local-vars-hook
+               reason-mode-local-vars-hook)
+             :append #'lsp!))
 
 
 (after! tuareg
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 12ecd8486..89bb548de 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -76,7 +76,7 @@ If set to `nil', disable all the above behaviors.")
                scss-mode-local-vars-hook
                sass-mode-local-vars-hook
                less-css-mode-local-vars-hook)
-             #'lsp!))
+             :append #'lsp!))
 
 (when (featurep! +tree-sitter)
   (add-hook 'css-mode-local-vars-hook #'tree-sitter! 'append))
diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el
index 526ddeda1..a1efe6fdc 100644
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@@ -167,7 +167,7 @@
   (add-hook! '(html-mode-local-vars-hook
                web-mode-local-vars-hook
                nxml-mode-local-vars-hook)
-             #'lsp!))
+             :append #'lsp!))
 
 (when (featurep! +tree-sitter)
   (add-hook! '(html-mode-local-vars-hook