# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1230636494 0
# Node ID c2a05360a02fd1b4d0c7fe304e1c603ea22069a2
# Parent  503c8d0db2bc6648113a8f36c685680bfe87d58e
(server-running-p): Remove interactive spec.  Fix
regexp.

diff -r 503c8d0db2bc -r c2a05360a02f lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 30 10:52:01 2008 +0000
+++ b/lisp/ChangeLog	Tue Dec 30 11:28:14 2008 +0000
@@ -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 -r 503c8d0db2bc -r c2a05360a02f lisp/server.el
--- a/lisp/server.el	Tue Dec 30 10:52:01 2008 +0000
+++ b/lisp/server.el	Tue Dec 30 11:28:14 2008 +0000
@@ -569,15 +569,12 @@
   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))))