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 337cce7346a37e22b7812ab26778cef3e8eac3f0..781440e84b3d73ca8533893a1f0e7dff6f5208ab 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -46,7 +46,7 @@
   (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)
@@ -66,24 +66,16 @@
 
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
-  (if (equal (system-name) "seras")
-      (set-default-font "Dejavu Sans Mono 11")
-    (set-default-font "Dejavu Sans Mono 13")))
-
-;(when window-system
-;  (set-default-font "Inconsolata-14")
-;  (set-face-font 'variable-pitch "Inconsolata-14")
-;  (set-fontset-font (frame-parameter nil 'font)
-;                    'japanese-jisx0208
-;                    '("Takaoゴシック" . "unicode-bmp")))
-
-;(when window-system
-;  (add-to-list 'default-frame-alist
-;               '(font . "Bitstream Vera Sans Mono 12"))
-;  (set-frame-font "Bitstream Vera Sans Mono 12")
-;  (set-fontset-font nil;(frame-parameter nil 'font)
-;                    'japanese-jisx0208
-;                    '("Hiragino Kaku Gothic Pro W3" . "unicode-bmp")))
+  (let ((host (system-name)))
+    (cond ((equal host "seras")
+           (set-frame-font "Dejavu Sans Mono 11" t))
+
+          ((equal host "aria.cielonegro.org")
+           (progn
+             (set-frame-font "Dejavu Sans Mono 13" t)
+             (set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
+             (set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック")
+             (set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック"))))))
 
 ;; Hooks for newline-and-indent ------------------------------------------------
 ;(mapcar (lambda (hook)
@@ -204,6 +196,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")
@@ -211,11 +211,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")
@@ -402,7 +402,7 @@
 (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))
+;(add-to-list 'auto-mode-alist '("\\.[Tt][Ss][Vv]\\'" . tsv-mode))
 
 ;; yaml-mode
 (autoload 'yaml-mode "yaml-mode"
@@ -528,6 +528,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/"))))
@@ -553,6 +554,7 @@
  '(tramp-default-method "sshx")
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(uniquify-trailing-separator-p t)
+ '(vc-cvs-stay-local nil)
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))