From: PHO <pho@cielonegro.org>
Date: Thu, 17 Nov 2011 01:16:33 +0000 (+0900)
Subject: Auto commit by The Sugar System.
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=a591f897052193ddc6dad37e2921688f0ba512c5;p=sugar.git

Auto commit by The Sugar System.
---

diff --git a/dot-files/_Xdefaults b/dot-files/_Xdefaults
index b7889dc..774c9ac 100644
--- a/dot-files/_Xdefaults
+++ b/dot-files/_Xdefaults
@@ -1,7 +1,7 @@
-emacs*Background: DarkSlateGray
-emacs*Foreground: Wheat
-emacs*pointerColor: Orchid
-emacs*cursorColor: Orchid
-emacs*bitmapIcon: on
-emacs*font: fixed
-emacs.geometry: 80x25
+! emacs*Background: DarkSlateGray
+! emacs*Foreground: Wheat
+! emacs*pointerColor: Orchid
+! emacs*cursorColor: Orchid
+! emacs*bitmapIcon: on
+! emacs*font: fixed
+! emacs.geometry: 80x25
diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 33ea9b4..a1d8165 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -32,7 +32,10 @@
 (setq ring-bell-function (lambda ()))
 (windmove-default-keybindings)
 
-(server-start)
+(require 'server)
+(if (server-running-p)
+    (message "Warning: server %S is already running." server-name)
+  (server-start))
 
 ;; Host specific configuration ------------------------------------------------
 (let ((host (system-name)))