Subject: 24.0.50; (server-force-stop) starts server process

From: Ulrich Mueller <[email-masked]>
Date: Mon, 15 Nov 2010 22:44:09 +0100

Recently added function server-force-stop (in lisp/server.el) doesn't
always stop the server, but starts it if no server process is running.

The behaviour can be reproduced as follows (commands in Lisp
interaction buffer):

   (require 'server)
   server

   server-process
   nil

   (server-force-stop)
   nil

   server-process
   #<process server>

Included below is a trivial patch that should fix it.

Ulrich

2010-11-15  Ulrich Mueller  <[email-masked]>

	* server.el (server-force-stop): Call server-start with first
	argument set to t.

--- lisp/server.el~
+++ lisp/server.el
@@ -609,7 +609,7 @@
 (defun server-force-stop ()
   "Kill all connections to the current server.
 This function is meant to be called from `kill-emacs-hook'."
-  (server-start nil t))
+  (server-start t t))
 
 ;;;###autoload
 (defun server-force-delete (&optional name)