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 5ea07e2efe746a8f6dac5bf63c6abf4bc69a605c..f9781b92c8b426098edde272d17cb6a990a61f17 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -50,7 +50,9 @@
 
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
-  (set-default-font "Dejavu Sans Mono 13"))
+  (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")
@@ -115,6 +117,11 @@
 ;; jaspace
 (require-if-present 'jaspace)
 
+;; color-theme
+(require-if-present 'color-theme)
+(if (featurep 'color-theme)
+    (color-theme-subtle-hacker))
+
 ;; auto-complete
 (require-if-present 'auto-complete-config)
 (if (featurep 'auto-complete-config)
@@ -142,7 +149,8 @@
 
 ;; undo-tree
 (require-if-present 'undo-tree)
-(global-undo-tree-mode)
+(if (featurep 'undo-tree)
+       (global-undo-tree-mode))
 
 ;; MPC
 ;(require-if-present 'mpc-autoloads)
@@ -162,9 +170,6 @@
 (require-if-present 'twittering-mode)
 (setq twittering-username "phonohawk")
 
-;; cedet
-(load-file-if-present "/usr/pkg/share/emacs/site-lisp/cedet/common/cedet.el")
-
 ;; riece
 (autoload 'riece "riece" "Start Riece" t)
 (add-hook 'riece-after-load-startup-hook
@@ -404,6 +409,7 @@
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
  '(Info-additional-directory-list (quote ("/sw/share/info" "/usr/local/info" "/usr/local/share/info")))
+ '(ac-ignore-case nil)
  '(appt-display-format (quote window))
  '(appt-message-warning-time 20)
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")