jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #369 from climatewarrior/add-web-mode

Browse source 
Fix issue disabling white-space-mode.
This commit is contained in:
Bozhidar Batsov 2013-08-01 14:31:21 -07:00
parent 0316fca8b7 8a182d8dd3
commit 2a6d240ce4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/prelude-web.el
View file

@ -49,15 +49,14 @@
(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)
(setq web-mode-code-indent-offset 4) (setq web-mode-code-indent-offset 4)
(setq web-mode-disable-autocompletion t) (setq web-mode-disable-autocompletion t)
(local-set-key (kbd "RET") 'newline-and-indent) (local-set-key (kbd "RET") 'newline-and-indent))
;; Disable whitespace-mode when using web-mode
(lambda () (whitespace-mode -1)))
(setq prelude-web-mode-hook 'prelude-web-mode-defaults) (setq prelude-web-mode-hook 'prelude-web-mode-defaults)
(add-hook 'web-mode-hook (lambda () (add-hook 'web-mode-hook (lambda ()