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

regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0f132d6aecf6d21f88dea06365f4ebfa5754e23..99af68ff07c74421aca83a562ac321f3f6e5b22f 100644 (file)
--- 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 f8c405b13058243b3a97097ae942ff9e43513cad..26a587346148db062883326998149a23abf96f80 100644 (file)
--- 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))))