Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 734823f81e842ccc69561e7c5140c8dd612fdd1f..87c334d70da64413d26470e0c19be5e1e4e7de5f 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -34,6 +34,11 @@
 
 (server-start)
 
+;; Host specific configuration ------------------------------------------------
+(let ((host (system-name)))
+  (cond ((equal host "aria.cielonegro.org")
+         (setq browse-url-firefox-program "/opt/local/bin/firefox"))))
+
 ;; Settings for Browser --------------------------------------------------------
 (setq browse-url-browser-function 'w3m-browse-url)
 (global-set-key "\C-xm" 'browse-url-at-point)
@@ -44,13 +49,13 @@
 (display-time)
 
 ;; Setting for Frames ----------------------------------------------------------
-(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")))
+;(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")))
 
 ;; Hooks for newline-and-indent ------------------------------------------------
 ;(mapcar (lambda (hook)
@@ -109,6 +114,10 @@
 (load "elscreen" "ElScreen" t)
 (require-if-present 'elscreen-w3m)
 
+;; undo-tree
+(require-if-present 'undo-tree)
+(global-undo-tree-mode)
+
 ;; MPC
 ;(require-if-present 'mpc-autoloads)
 
@@ -277,6 +286,7 @@
 (setq cperl-indent-parens-as-block t)
 
 ;; Erlang
+(add-to-list 'load-path "/usr/pkg/lib/erlang/lib/tools-2.6/emacs")
 (require-if-present 'erlang-start)
 (setq erlang-electric-commands nil)
 
@@ -372,7 +382,7 @@
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
- '(completion-ignored-extensions (quote (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi" ".beam")))
+ '(completion-ignored-extensions (quote (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
  '(default-frame-alist (quote ((tool-bar-lines . 0) (menu-bar-lines . 1) (width . 80) (height . 25) (right-fringe) (left-fringe))))
  '(ecb-add-path-for-not-matching-files (quote (t)))