X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=26ee810616136c42330956572321abae9ba3fab7;hb=3af9245971edb851e5d02dac43f837cfe58762fd;hp=e1ba9cda1834d4fc48c6b497b7c5a2ecb90faf56;hpb=3d19a710d2ff901c60b4b87e2ccc2f358fa8f91b;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e1ba9cd..26ee810 100644
--- 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))
@@ -45,14 +46,13 @@
   (cond ((equal host "aria.cielonegro.org")
          (progn
            ;; Use firefox as the default browser.
-           (setq browse-url-firefox-program "/opt/local/bin/firefox")
+           (setq browse-url-firefox-program "/usr/pkg/bin/firefox")
            ;; Specify how to connect to some of the remote servers.
            (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))
@@ -199,6 +204,14 @@
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 
+;; scala-mode2
+(add-to-list 'load-path "~/sandbox/_scala/scala-mode2")
+(require-if-present 'scala-mode2)
+
+;; sbt-mode
+(add-to-list 'load-path "~/sandbox/_scala/sbt-mode")
+(require-if-present 'sbt-mode)
+
 ;; twittering-mode
 (require-if-present 'twittering-mode)
 (setq twittering-username "phonohawk")
@@ -206,11 +219,11 @@
 ;; riece
 (autoload 'riece "riece" "Start Riece" t)
 (add-hook 'riece-after-load-startup-hook
-		  #'(lambda ()
-			  (add-to-list 'riece-addons 'riece-alias)
-			  (add-to-list 'riece-addons 'riece-skk-kakutei)
-			  (add-to-list 'riece-addons 'riece-keyword)
-			  (add-to-list 'riece-addons 'riece-ctlseq)))
+          #'(lambda ()
+              (add-to-list 'riece-addons 'riece-alias)
+              (add-to-list 'riece-addons 'riece-skk-kakutei)
+              (add-to-list 'riece-addons 'riece-keyword)
+              (add-to-list 'riece-addons 'riece-ctlseq)))
 
 ;; CEDET
 (add-to-list 'load-path "/usr/pkg/share/emacs/cedet/common")
@@ -392,6 +405,13 @@
   "Major mode for editing comma-separated value files." t)
 (add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
 
+;; tsv-mode
+(autoload 'tsv-mode "tsv-mode" "A mode to edit table like file" t)
+(autoload 'tsv-normal-mode "tsv-mode" "A minor mode to edit table like file" t)
+(setq tsv-write-annotation nil)
+(setq tsv-separator-list '("\t"))
+(add-to-list 'auto-mode-alist '("\\.[Tt][Ss][Vv]\\'" . tsv-mode))
+
 ;; yaml-mode
 (autoload 'yaml-mode "yaml-mode"
   "Major mode for editing YAML files." t)
@@ -516,6 +536,7 @@
  '(mew-summary-form (quote (type (5 date) " " (14 from) " " t (14 x-classification) " " (30 subj) "|" (0 body))))
  '(mouse-wheel-progessive-speed nil)
  '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control)))))
+ '(mpc-browser-tags (quote (Directory Genre Artist|Composer|Performer Album|Playlist)))
  '(navi2ch-browse-url-browser-function (quote browse-url-firefox))
  '(navi2ch-display-splash-screen nil)
  '(navi2ch-list-moved-board-alist (quote (("http://mamono.2ch.net/ihou/" . "http://hideyoshi.2ch.net/ihou/"))))
@@ -569,6 +590,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")))))