use mode hooks instead of setq-default

diff --git a/lisp/my-file-modes.el b/lisp/my-file-modes.el
index 006089201e682a6d8e3ed30f69fede5487ad2b9c..c1719329567e7ca76cd1956d8bed6332816f688d 100644 (file)
--- a/lisp/my-file-modes.el
+++ b/lisp/my-file-modes.el
@@ -1,11 +1,15 @@
 ;;; -*- lexical-binding: t -*-
 
 (setq-default indent-tabs-mode nil)
-(setq-default c-basic-offset 4)
-(setq-default python-indent-offset 4)
+
+(require 'cc-mode)
+(setq c-auto-align-backslashes nil)
+(setq c-default-style '((java-mode . "java")
+                        (awk-mode . "awk")
+                        (other . "stroustrup")))
 
 (require 'coffee-mode)
-(setq-default coffee-tab-width 4)
+(setq coffee-tab-width 4)
 
 (require 'dockerfile-mode)
 
@@ -20,8 +24,7 @@
 (require 'js)
 (add-hook 'json-mode-hook
           (lambda ()
-            (make-local-variable 'js-indent-level)
-            (setq js-indent-level 2)))
+            (set (make-local-variable 'js-indent-level) 2)))
 
 (require 'js2-mode)
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
@@ -36,7 +39,10 @@
 
 (require 'python)
 (add-hook 'python-mode-hook
-          (lambda () (setq forward-sexp-function nil)))
+          (lambda ()
+            (setq forward-sexp-function nil)
+            (set (make-local-variable 'python-indent-offset) 4)))
+
 
 (require 'scala-mode)