Merge remote-tracking branch 'origin/master' into yelp

2013-09-10 17:23:45 -07:00 · 2013-09-10 17:23:45 -07:00 · 3ca39d6424
commit 3ca39d6424
parent 5b68e3d34e e719fa65a8
1 changed files with 8 additions and 0 deletions
--- a/init.el
+++ b/init.el
@ -62,6 +62,14 @@
 ;; find-file-in-project
 (setq ffip-limit 9999999999)

+(setq js-indent-level 2)
+
+(defun no-auto-fill-hook () (auto-fill-mode -1))
+
+(add-hook 'html-mode-hook 'no-auto-fill-hook)
+
+(setq flyspell-issue-welcome-flag nil)
+
 ;; =============================================================================
 ;;                                                                          tmux
 ;; =============================================================================