From: Andreas Schwab <schwab@suse.de>
Date: Tue, 30 Dec 2008 11:28:14 +0000 (+0000)
Subject: (server-running-p): Remove interactive spec.  Fix
X-Git-Tag: emacs-pretest-23.0.90~810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9569a55d8301cc67f760db82ae41b4469ab1871;p=emacs.git

(server-running-p): Remove interactive spec.  Fix
regexp.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0f132d6aec..99af68ff07c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-30  Andreas Schwab  <schwab@suse.de>
+
+	* server.el (server-running-p): Remove interactive spec.  Fix
+	regexp.
+
 2008-12-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* follow.el (follow-calc-win-start): Don't use `inline'.
diff --git a/lisp/server.el b/lisp/server.el
index f8c405b1305..26a58734614 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -569,15 +569,12 @@ Return values:
   t                the server seems to be running.
   something else   we cannot determine whether it's running without using
                    commands which may have to wait for a long time."
-  (interactive
-   (list (if current-prefix-arg
-	     (read-string "Server name: " nil nil server-name))))
   (unless name (setq name server-name))
   (condition-case nil
       (if server-use-tcp
 	  (with-temp-buffer
 	    (insert-file-contents-literally (expand-file-name name server-auth-dir))
-	    (or (and (looking-at "127\.0\.0\.1:[0-9]+ \\([0-9]+\\)")
+	    (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
 		     (assq 'comm
 			   (system-process-attributes
 			    (string-to-number (match-string 1))))