Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e957402df88351c0173e80e22a875703b2444426..d0920c1934dee2bc58dcb4f29063f3840fc23b42 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -329,16 +329,6 @@
       objc-mode-hook
       java-mode-hook))
 
-;; css
-(autoload 'css-mode "css-mode" "For editing CSS file" t)
-(setq cssm-indent-level 4)
-(setq cssm-mirror-mode nil)
-(setq cssm-indent-function 'cssm-c-style-indenter)
-(setq auto-mode-alist
-      (append
-       '(("\\.css$" . css-mode))
-       auto-mode-alist))
-
 ;; EmacsWiki
 (autoload 'emacs-wiki-find-file "emacs-wiki" "Emacs Wiki" t)
 (defalias 'wiki 'emacs-wiki-find-file)
@@ -391,6 +381,11 @@
   "Major mode for editing comma-separated value files." t)
 (add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
 
+;; yaml-mode
+(autoload 'yaml-mode "yaml-mode"
+  "Major mode for editing YAML files." t)
+(add-to-list 'auto-mode-alist '("\\.ya?ml$"  . yaml-mode))
+
 ;; ChangeLog
 (setq user-full-name "PHO")
 (setq user-mail-address "pho@cielonegro.org")
@@ -477,6 +472,7 @@
  '(ecb-tree-buffer-style (quote ascii-guides))
  '(ecb-windows-width 0.2)
  '(elscreen-display-tab t)
+ '(global-whitespace-mode t)
  '(haskell-program-name "ghci")
  '(ido-enable-flex-matching t)
  '(ido-everywhere t)
@@ -538,6 +534,7 @@
  '(w3m-output-coding-system (quote utf-8))
  '(w3m-terminal-coding-system (quote utf-8))
  '(w3m-use-cookies t)
+ '(whitespace-style (quote (face tabs trailing lines space-before-tab newline indentation empty space-after-tab tab-mark)))
  '(x-select-enable-clipboard t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.