Mercurial > emacs
changeset 100767:c2a05360a02f
(server-running-p): Remove interactive spec. Fix
regexp.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Tue, 30 Dec 2008 11:28:14 +0000 |
| parents | 503c8d0db2bc |
| children | 20014579730d |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- 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))))