Update yaml-mode and make .emacs .emacs.pure and .emacs.termfix compliant with eachother

1 files changed, 8 insertions, 15 deletions

diff --git a/.emacs b/.emacs
index 6aa5873..222eb12 100644
--- a/.emacs
+++ b/.emacs
@@ -1,13 +1,6 @@
 ;; Set up the keyboard so the delete key on both the regular keyboard
 ;; and the keypad delete the character under the cursor and to the right
 ;; under X, instead of the default, backspace behavior.
-
-;; Added by Package.el.  This must come before configurations of
-;; installed packages.  Don't delete this line.  If you don't want it,
-;; just comment it out by adding a semicolon to the start of the line.
-;; You may delete these explanatory comments.
-;;(package-initialize)
-
 (global-set-key [delete] 'delete-char)
 (global-set-key [kp-delete] 'delete-char)
 
@@ -77,6 +70,14 @@
 (setq which-func-modes '(c-mode c++-mode java-mode python-mode))
 (which-function-mode t)
 
+;; Python
+(require 'whitespace)
+(add-hook 'python-mode-hook
+          (lambda ()
+            (progn
+              (setq whitespace-line-column 79)
+              (setq whitespace-style '(face empty tabs lines-tail trailing))
+              (whitespace-mode))))
 
 ;; Custom plugins
 (add-to-list 'load-path "~/.emacs.d/lisp/")
@@ -94,14 +95,6 @@
 (require 'yaml-mode)
 (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
 
-;; Python
-(require 'whitespace)
-(add-hook 'python-mode-hook
-          (lambda ()
-            (progn
-              (setq whitespace-line-column 79)
-              (setq whitespace-style '(face empty tabs lines-tail trailing))
-              (whitespace-mode))))
 
 ;; yasnippet
 (require 'yasnippet)