Merge pull request #485 from bixuanzju/patch-1

web-mode is now compatible with minor modes
This commit is contained in:
Bozhidar Batsov 2014-02-02 23:16:42 -08:00
commit 1bb8852b0f

View file

@ -49,8 +49,6 @@
(eval-after-load 'web-mode (eval-after-load 'web-mode
'(progn '(progn
(defun prelude-web-mode-defaults () (defun prelude-web-mode-defaults ()
;; Disable whitespace-mode when using web-mode
(whitespace-mode -1)
;; Customizations ;; Customizations
(setq web-mode-markup-indent-offset 4) (setq web-mode-markup-indent-offset 4)
(setq web-mode-css-indent-offset 2) (setq web-mode-css-indent-offset 2)