Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 1fcc638039da480767f415adf1d458cea7dabcd1..7d282bdc2e73818b5fb47eadc91effb073a7d988 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -261,6 +261,11 @@
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
 (add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
 
+;; vimrc
+(autoload 'vimrc-mode "vimrc-mode"
+  "Major mode for editing `.vimrc', `xxx.vim' and `.exrc' files." t)
+(add-to-list 'auto-mode-alist '("\\.vim\\(rc\\)?$" . vimrc-mode))
+
 ;; ido
 (require 'ido)
 (ido-mode t)
@@ -329,16 +334,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)
@@ -384,7 +379,26 @@
 (autoload 'po-mode "po-mode")
 (setq auto-mode-alist
       (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
-           auto-mode-alist))
+        auto-mode-alist))
+
+;; csv-mode
+(autoload 'csv-mode "csv-mode"
+  "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))
+
+;; Troublesome Tasks
+(if (equal (system-name) "seras")
+    (progn
+      (defun edit-troublesome-tasks ()
+        (interactive)
+        (elscreen-create)
+        (find-file (expand-file-name "~/var/troublesome-tasks.txt")))
+      (define-key ctl-x-map "MT" #'edit-troublesome-tasks)))
 
 ;; ChangeLog
 (setq user-full-name "PHO")
@@ -417,13 +431,13 @@
 
 ;; Emacs Calc
 (add-hook 'calc-start-hook
-         (lambda ()
-           (if (functionp 'paren-deactivate)
-               (paren-deactivate))))
+          (lambda ()
+            (if (functionp 'paren-deactivate)
+                (paren-deactivate))))
 (add-hook 'calc-end-hook
-         (lambda ()
-           (if (functionp 'paren-activate)
-               (paren-activate))))
+          (lambda ()
+            (if (functionp 'paren-activate)
+                (paren-activate))))
 
 ;;; emacs-w3m
 (autoload 'w3m "w3m" "Interface for w3m on Emacs." t)
@@ -460,6 +474,7 @@
  '(compilation-scroll-output (quote first-error))
  '(completion-ignored-extensions (quote (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
+ '(csv-align-style (quote auto))
  '(default-frame-alist (quote ((tool-bar-lines . 0) (menu-bar-lines . 1) (width . 80) (height . 25) (right-fringe) (left-fringe))))
  '(ditz-find-issue-directory-automatically-flag t)
  '(ecb-add-path-for-not-matching-files (quote (t)))
@@ -471,6 +486,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)
@@ -532,6 +548,8 @@
  '(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)))
+ '(woman-cache-filename "~/.wmncach.el")
  '(x-select-enable-clipboard t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.
@@ -543,4 +561,5 @@
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))
  '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold))))
- '(which-func-face ((t (:background "black" :foreground "dark orange")))))
+ '(which-func-face ((t (:background "black" :foreground "dark orange"))))
+ '(whitespace-indentation ((t (:foreground "dimgray" :underline t)))))