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 e3c680295cd0ffe25930d4461123812ad9f76ea2..841bff80db53cf90364d83515cc52b76e1ef8744 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -48,10 +48,12 @@
            (setq browse-url-firefox-program "/opt/local/bin/firefox")
            ;; Specify how to connect to some of the remote servers.
            (setq tramp-default-proxies-alist nil)
-           (add-to-list 'tramp-default-proxies-alist
-                        '("rd8" nil "/sshx:pho@yebisu1.ymir.jp:"))
-           (add-to-list 'tramp-default-proxies-alist
-                        '("yebisu1\\.ymir\\.jp" nil "/sshx:pho@boss:"))))))
+           (mapcar #'(lambda (proxy)
+                       (add-to-list 'tramp-default-proxies-alist proxy))
+            '( ("rd8"                                 nil "/sshx:pho@yebisu1.ymir.jp:")
+               ("pho\\.dev\\.office\\.ymir\\.co\\.jp" nil "/sshx:pho@yebisu1.ymir.jp:")
+               ("yebisu1\\.ymir\\.jp"                 nil "/sshx:pho@boss:"           )
+               ))))))
 
 ;; Settings for Browser --------------------------------------------------------
 (setq browse-url-browser-function 'w3m-browse-url)
@@ -171,6 +173,7 @@
 
 ;; elscreen
 (load "elscreen" "ElScreen" t)
+(elscreen-start)
 (require-if-present 'elscreen-w3m)
 
 ;; undo-tree
@@ -552,7 +555,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)))
+ '(whitespace-style (quote (face tabs trailing lines-tail space-before-tab newline indentation empty space-after-tab tab-mark)))
  '(woman-cache-filename "~/.wmncach.el")
  '(x-select-enable-clipboard t))
 (custom-set-faces
@@ -568,4 +571,5 @@
  '(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"))))
- '(whitespace-indentation ((t (:foreground "dimgray" :underline t)))))
+ '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))
+ '(whitespace-line ((t (:background "gray20")))))