From 35579ba5775fbdfb6e6ea11801458490fc53a1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Tue, 19 Feb 2019 21:01:58 -0500
Subject: [PATCH] disable scss-mode and edit scss files with web-mode

---
 modules/init-scss.el     | 10 +++++-----
 modules/init-web-mode.el |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/init-scss.el b/modules/init-scss.el
index 328eea6..2d4c707 100644
--- a/modules/init-scss.el
+++ b/modules/init-scss.el
@@ -6,11 +6,11 @@
 ;;----------------------------------------------------------------------------
 ;; Scss Mode
 ;;----------------------------------------------------------------------------
-(use-package scss-mode
-  :defer t
-  :mode ("\\.scss\\'" . scss-mode)
-  :config
-  (setq scss-compile-at-save 'nil))
+;; (use-package scss-mode
+;;   :defer t
+;;   :mode ("\\.scss\\'" . scss-mode)
+;;   :config
+;;   (setq scss-compile-at-save 'nil))
 
 (provide 'init-scss)
 
diff --git a/modules/init-web-mode.el b/modules/init-web-mode.el
index ae3be70..e5016c9 100644
--- a/modules/init-web-mode.el
+++ b/modules/init-web-mode.el
@@ -9,6 +9,7 @@
          ("\\.tpl\\'"    . web-mode)
          ("\\.jsp\\'"    . web-mode)
          ("\\.gsp\\'"    . web-mode)
+         ("\\.scss\\'"   . web-mode)
          ("\\.ctp\\'"    . web-mode))
   :config
   ;; web-modeの設定