Auto commit by The Sugar System.

diff --git a/dot-files/_Xdefaults b/dot-files/_Xdefaults
index b7889dc39c644b9cc048b2dead88e114a110c391..774c9acf953d9525d4ed1b59c2fbe8f9f7ffedd1 100644 (file)
--- 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 33ea9b49aef842ddc33050f654172d348ade633e..a1d8165e57725e84d2249f5d4d71a4aa870eef52 100644 (file)
--- 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)))