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

1 files changed, 25 insertions, 2 deletions

diff --git a/.emacs.pure b/.emacs.pure
index 40c5ebd..085f6ea 100644
--- a/.emacs.pure
+++ b/.emacs.pure
@@ -4,6 +4,9 @@
 (global-set-key [delete] 'delete-char)
 (global-set-key [kp-delete] 'delete-char)
 
+(global-set-key (kbd "S-C-<left>") 'shrink-window-horizontally)
+(global-set-key (kbd "S-C-<right>") 'enlarge-window-horizontally)
+
 ;; My own key bindings ;;
 ;;(global-set-key [f1] 'compile)
 
@@ -44,15 +47,35 @@
 (set-terminal-coding-system 'utf-8)
 (set-keyboard-coding-system 'utf-8)
 
+(put 'downcase-region 'disabled nil)
+(kill-buffer "*scratch*")
+
 
 ;; Programming section
 
 ;; Indentation
-;;(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
-(setq-default c-basic-offset 4 tab-width 4)
+(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
+;;(setq-default c-basic-offset 4 tab-width 4)
 
 ;; Default coding style
 (setq c-default-style "bsd")
 
 ;; Don't attempt to guess the Python-indent
 (setq python-indent-guess-indent-offset nil)
+
+;; Bind .ino (Arduino project) extension to C++ mode
+(add-to-list 'auto-mode-alist '("\\.ino\\'" . c++-mode))
+
+;; Enable which-function-mode for C, C++ and Python
+(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))))
+