dot/emacs: Look for running server before leaping at starting a new one.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index b78c03c..07c1e33 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -141,11 +141,14 @@
                  edit-server-new-frame nil
                  server-raise-frame nil
                  gnuserv-frame t)
-           (trap (let ((warning-suppress-types
-                        (cons '(server)
-                              (and (boundp 'warning-suppress-types)
-                                   warning-suppress-types))))
-                   (server-start)))
+           (trap (progn
+                   (require 'server)
+                   (let ((state (server-running-p)))
+                     (if state
+                         (message "Emacs server %s: not starting"
+                                  (cond ((eq state t) "already running")
+                                        (t "maybe running")))
+                       (server-start)))))
            (trap (progn
                    (require 'edit-server)
                    (edit-server-start)