aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/server.el
diff options
context:
space:
mode:
authorAndreas Schwab2008-12-30 11:28:14 +0000
committerAndreas Schwab2008-12-30 11:28:14 +0000
commitd9569a55d8301cc67f760db82ae41b4469ab1871 (patch)
tree9869bb00c273683f2ba0194addbab7b87126b5b4 /lisp/server.el
parent4484b97dcd8dfb90121c3524c544bc4c772e5108 (diff)
downloademacs-d9569a55d8301cc67f760db82ae41b4469ab1871.tar.gz
emacs-d9569a55d8301cc67f760db82ae41b4469ab1871.zip
(server-running-p): Remove interactive spec. Fix
regexp.
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el5
1 files changed, 1 insertions, 4 deletions
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:
569 t the server seems to be running. 569 t the server seems to be running.
570 something else we cannot determine whether it's running without using 570 something else we cannot determine whether it's running without using
571 commands which may have to wait for a long time." 571 commands which may have to wait for a long time."
572 (interactive
573 (list (if current-prefix-arg
574 (read-string "Server name: " nil nil server-name))))
575 (unless name (setq name server-name)) 572 (unless name (setq name server-name))
576 (condition-case nil 573 (condition-case nil
577 (if server-use-tcp 574 (if server-use-tcp
578 (with-temp-buffer 575 (with-temp-buffer
579 (insert-file-contents-literally (expand-file-name name server-auth-dir)) 576 (insert-file-contents-literally (expand-file-name name server-auth-dir))
580 (or (and (looking-at "127\.0\.0\.1:[0-9]+ \\([0-9]+\\)") 577 (or (and (looking-at "127\\.0\\.0\\.1:[0-9]+ \\([0-9]+\\)")
581 (assq 'comm 578 (assq 'comm
582 (system-process-attributes 579 (system-process-attributes
583 (string-to-number (match-string 1)))) 580 (string-to-number (match-string 1))))