From bc11973b964301d6dac33915f1e36ea5babb8ee7 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 18 Feb 2011 14:36:10 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- dot-files/_emacs_el | 6 ++---- dot-files/_xinitrc | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 5ea07e2..1699e7c 100644 --- 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 7206a4b..84cac20 100644 --- 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 -- 2.40.0