Mercurial > emacs
changeset 111619:1753163664ab
* lisp/server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 16 Nov 2010 15:09:47 -0500 |
| parents | 34eb23415cf2 |
| children | d7f360c219d0 |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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)