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 96b34c14b6249b93d73db6173889cf1728394e6a..e439c5e2b5013c0f6f40ac73552e7d27893e5d13 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)
@@ -552,7 +554,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
@@ -560,10 +562,13 @@
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
+ '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold))))
+ '(diff-removed ((t (:foreground "gold3" :weight extra-bold))))
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(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"))))
- '(whitespace-indentation ((t (:foreground "dimgray" :underline t)))))
+ '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))
+ '(whitespace-line ((t (:background "gray20")))))