Upgrade all, add yaml, few snippet fixes

1 files changed, 6 insertions, 1 deletions

diff --git a/.emacs b/.emacs
index 5ab06e9..fc619f9 100644
--- a/.emacs
+++ b/.emacs
@@ -48,7 +48,8 @@
 ;; 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 indent-tabs-mode nil)
+(setq-default c-basic-offset 4 tab-width 4)
 
 ;; Default coding style
 (setq c-default-style "bsd")
@@ -64,6 +65,10 @@
 (autoload 'php-mode "php-mode" "Mode for editing PHP source files")
 (add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
 
+;; YAML
+(require 'yaml-mode)
+(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+
 ;; yasnippet
 (require 'yasnippet)
 (yas-global-mode 1)