From: PHO <pho@cielonegro.org>
Date: Thu, 2 Oct 2014 08:49:40 +0000 (+0900)
Subject: Auto commit by The Sugar System.
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=sugar.git;a=commitdiff_plain;h=8468a99dff0c677edc12110d4a8e0a898c2869e9

Auto commit by The Sugar System.
---

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 337cce7..ab832c1 100644
--- 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)
@@ -204,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")
@@ -211,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")