From 8a6fc00b5ee8beb6f281a6be8a9a91691bf5a139 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 9 Mar 2012 12:20:46 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- dot-files/_emacs_el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index e957402..d0920c1 100644 --- 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. -- 2.40.0