diff --git a/.gitignore b/.gitignore index 0e415e3..d5c3bed 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,8 @@ npm-debug.log */dotfiles/config/wireshark/recent_common +dotfiles/config/gtk-2.0 +dotfiles/config/xbuild +dotfiles/config/stetic +dotfiles/config/NuGet +dotfiles/config/GitExtensions diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index e8a0cc7..37018f7 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -372,6 +372,9 @@ (company-emacs-eclim-setup) ) +(eval-after-load "java-mode" + '(progn + setq whitespace-line-column 120)) (add-hook 'java-mode-hook 'my-java-mode-hook) ;;-------------------------------------------------------------------------------------