From e77545f1f8a333e7fd80bf0991a86bb23adc87ab Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 3 Mar 2017 23:59:53 -0500
Subject: [PATCH] Move rainbow-delimiters-mode activation to respective lang
 modules

---
 core/core-ui.el                   | 4 +---
 modules/lang/cc/config.el         | 1 +
 modules/lang/emacs-lisp/config.el | 1 +
 modules/lang/javascript/config.el | 7 +++++--
 modules/lang/web/+css.el          | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/core-ui.el b/core/core-ui.el
index bfc8b93a2..8ac868ff5 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -198,9 +198,7 @@ file."
 (def-package! rainbow-delimiters
   :commands rainbow-delimiters-mode
   :config (setq rainbow-delimiters-max-face-count 3)
-  :init
-  (add-hook! (emacs-lisp-mode lisp-mode js-mode css-mode c-mode-common)
-    'rainbow-delimiters-mode))
+  :init (add-hook 'lisp-mode-hook 'rainbow-delimiters-mode))
 
 
 ;;
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 99a319b69..953daae12 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -27,6 +27,7 @@
   (setq c-tab-always-indent nil
         c-electric-flag nil)
 
+  (add-hook 'c-mode-common-hook 'rainbow-delimiters-mode)
   ;; extra highlights for numbers in C (`modern-cpp-font-lock' offers something better for C++)
   (add-hook 'c-mode-hook 'highlight-numbers-mode)
   ;; Fontification of C++11 string literals
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 44e872efa..10aa77933 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -28,6 +28,7 @@
     (eldoc-mode +1)
     (highlight-quoted-mode +1)
     (auto-compile-on-save-mode +1)
+    (rainbow-delimiters-mode +1)
 
     (font-lock-add-keywords
      nil `(;; Display "lambda" as λ
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 56dd4bedd..c7bcc2bc9 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -10,9 +10,12 @@
         js2-highlight-external-variables nil
         js2-mode-show-parse-errors nil)
 
-  (add-hook! js2-mode '(tern-mode flycheck-mode highlight-indent-guides-mode))
+  (add-hook! 'js2-mode-hook
+    '(tern-mode flycheck-mode highlight-indent-guides-mode
+      rainbow-delimiters-mode))
+
   ;; Conform switch-case indentation to editorconfig's config
-  (add-hook! js2-mode (setq js-switch-indent-offset js-indent-level))
+  (add-hook! 'js2-mode-hook (setq js-switch-indent-offset js-indent-level))
 
   (set! :repl 'js2-mode 'nodejs-repl)
 
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 32f69e2af..626c15024 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -1,5 +1,7 @@
 ;;; lang/web/+css.el
 
+(add-hook! (css-mode scss-mode less-css-mode) 'rainbow-delimiters-mode)
+
 (sp-with-modes '(css-mode scss-mode less-css-mode stylus-mode)
   (sp-local-pair "/*" "*/" :post-handlers '(("[d-3]||\n[i]" "RET") ("| " "SPC"))))