# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1289938187 18000
# Node ID 1753163664ab639cd6748b70d42299accedd0d09
# Parent  34eb23415cf284b7057c7fd3d8de701b2718ed42
* lisp/server.el (server-force-stop): Ensure the server is stopped (Bug#7409).

diff -r 34eb23415cf2 -r 1753163664ab lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 14 12:47:31 2010 +0100
+++ b/lisp/ChangeLog	Tue Nov 16 15:09:47 2010 -0500
@@ -1,3 +1,7 @@
+2010-11-16  Ulrich Mueller  <ulm@gentoo.org>
+
+	* server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
+
 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
diff -r 34eb23415cf2 -r 1753163664ab lisp/server.el
--- a/lisp/server.el	Sun Nov 14 12:47:31 2010 +0100
+++ b/lisp/server.el	Tue Nov 16 15:09:47 2010 -0500
@@ -594,7 +594,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)