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 e1ba9cda1834d4fc48c6b497b7c5a2ecb90faf56..626b907759fcb39473c5022cce22a95f27088fae 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -19,7 +19,8 @@
 (setq read-file-name-completion-ignore-case t)
 (tool-bar-mode nil)
 
-(global-set-key "\C-\\" 'toggle-input-method)
+(global-set-key (kbd "C-\\" ) 'toggle-input-method)
+(global-set-key (kbd "C-RET") 'completion-at-point)
 
 (unless window-system
   (normal-erase-is-backspace-mode t))
@@ -50,9 +51,8 @@
            (setq tramp-default-proxies-alist nil)
            (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:"           )
+            '( ("rd8"                                 nil "/sshx:pho@seras.vpn.cielonegro.org:")
+               ("pho\\.dev\\.office\\.ymir\\.co\\.jp" nil "/sshx:pho@seras.vpn.cielonegro.org:")
                ))))))
 
 ;; Settings for Browser --------------------------------------------------------
@@ -191,6 +191,11 @@
       (append '(("\\.rst$" . rst-mode)
                 ("\\.rest$" . rst-mode)) auto-mode-alist))
 
+;; textile-mode
+(autoload 'textile-mode "textile-mode"
+  "Major mode for editing Textile documents." t)
+(add-to-list 'auto-mode-alist '("\\.textile\\'" . textile-mode))
+
 ;; xsltxt-mode
 (autoload 'xsltxt-mode "xsltxt-mode" "Major mode for xsltxt." t)
 (add-to-list 'auto-mode-alist '("\\.xsltxt$" . xsltxt-mode))
@@ -569,6 +574,9 @@
  '(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))))
+ '(textile-link-face ((t (:foreground "cyan"))))
+ '(textile-ol-bullet-face ((t (:foreground "dark orange"))))
+ '(textile-ul-bullet-face ((t (:foreground "deep sky blue"))))
  '(which-func-face ((t (:background "black" :foreground "dark orange"))))
  '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))
  '(whitespace-line ((t (:background "gray20")))))