[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100214: * lisp/server.el (server-force-stop): Ensure the server is stopped (Bug#7409).

[Chong Yidong]

------------------------------------------------------------
revno: 100214
author: Ulrich Mueller <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-11-16 15:09:47 -0500
message:
  * lisp/server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-13 21:07:58 +0000
+++ b/lisp/ChangeLog    2010-11-16 20:09:47 +0000
@@ -1,3 +1,7 @@
+2010-11-16  Ulrich Mueller  <address@hidden>
+
+       * server.el (server-force-stop): Ensure the server is stopped 
(Bug#7409).
+
 2010-11-13  Eli Zaretskii  <address@hidden>
 
        * subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2010-11-01 03:35:06 +0000
+++ b/lisp/server.el    2010-11-16 20:09:47 +0000
@@ -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)