aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/server.el
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2010-11-17 22:54:14 -0500
committerStefan Monnier <[email protected]>2010-11-17 22:54:14 -0500
commit4a47c2757309e338321da1e7a2f6d399a306ce7d (patch)
treede441bac2c90c3302459c5f0ffe9c53ec4b31c2f /lisp/server.el
parent8bbb7dd8a6d08540a81a7a2baa2274d8e6d65c92 (diff)
parentb916cbefa481920a49eac03c7025693f38afc882 (diff)
Merge from emacs-23
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el
index ecc9b16cce..e3af82231a 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -609,7 +609,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
(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)