Only use server-running-p if it is available

candera · Feb 22, 2013 · 8a7d157 · 8a7d157
1 parent 63a065b
commit 8a7d157
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/init.el b/init.el
@@ -18,7 +18,9 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (require 'server)
 (unless (or (eq system-type 'windows-nt)
-            (server-running-p))
+            (if (fboundp 'server-running-p)
+		(server-running-p)
+	      server-process))
   (server-start))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;