Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 5ea07e2efe746a8f6dac5bf63c6abf4bc69a605c..1699e7c5e5e6e48da73f0417d410747ee59cd461 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -142,7 +142,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 +163,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

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index 7206a4b1d301ca6517b333461d73b6450452ad9c..84cac20dec9df75a97e01d715599fa843eda9f49 100644 (file)
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -50,7 +50,9 @@ GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 xhost +localhost
 
 # Set the mouse speed
-xset m 5 4
+if [ `hostname` != "seras" ]; then
+    xset m 5 4
+fi
 
 # Launch ssh-agent-manager
 if which ssh-agent-manager 2>&1 >/dev/null; then
@@ -63,4 +65,7 @@ echo ".xinitrc is going to exec window manager..."
 if which quartz-wm 2>&1 >/dev/null; then
     quartz-wm --only-proxy &
 fi
+if which vmware-user 2>&1 >/dev/null; then
+    vmware-user &
+fi
 exec fluxbox