[Emacs-diffs] emacs/lisp ChangeLog server.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/12/30 11:28:17

Modified files:
        lisp           : ChangeLog server.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15009&r2=1.15010
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.177&r2=1.178

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15009
retrieving revision 1.15010
diff -u -b -r1.15009 -r1.15010
--- ChangeLog   30 Dec 2008 10:51:41 -0000      1.15009
+++ ChangeLog   30 Dec 2008 11:28:14 -0000      1.15010
@@ -1,3 +1,8 @@
+2008-12-30  Andreas Schwab  <address@hidden>
+
+       * server.el (server-running-p): Remove interactive spec.  Fix
+       regexp.
+
 2008-12-30  Chong Yidong  <address@hidden>
 
        * follow.el (follow-calc-win-start): Don't use `inline'.

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- server.el   16 Dec 2008 21:23:07 -0000      1.177
+++ server.el   30 Dec 2008 11:28:17 -0000      1.178
@@ -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))))