Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 21:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
regexp.
This commit is contained in:
Andreas Schwab 2008-12-30 11:28:14 +00:00
parent 4484b97dcd
commit d9569a55d8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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'.

5
lisp/server.el
View file

@ -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))))