From 8c5db2e08a56a492e4bd71846f3d22fde13e1b55 Mon Sep 17 00:00:00 2001 From: Dave Musicant / thinkpad Date: Wed, 21 Oct 2020 06:10:12 -0500 Subject: [PATCH] Modify documentation to reflect that Emacs server is off by default Pull request #10297 made the Emacs server optional, so that it does not start up unless the init file is modified to enable it. The documentation, however, indicates that the opposite is true. This fix updates the documentation to be consistent with the actual behavior. --- doc/DOCUMENTATION.org | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index 116841a5f..a2544303d 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -210,7 +210,6 @@ - [[#emacs-server][Emacs Server]] - [[#connecting-to-the-emacs-server][Connecting to the Emacs server]] - [[#keeping-the-server-alive][Keeping the server alive]] - - [[#disabling-the-emacs-server][Disabling the Emacs server]] - [[#troubleshoot][Troubleshoot]] - [[#loading-fails][Loading fails]] - [[#upgradingdowngrading-emacs-version][Upgrading/Downgrading Emacs version]] @@ -3634,8 +3633,13 @@ To customize your editorconfig experience, read [[https://github.com/editorconfi documentation]]. * Emacs Server -Spacemacs starts a server at launch. This server is killed whenever you close -your Emacs windows. +Spacemacs provides the ability to start a server at launch, and to kill that +server whenever you close your Emacs windows. This can be enabled by setting the +variable =dotspacemacs-enable-server= to =t= in your =~./spacemacs=. + +#+BEGIN_SRC emacs-lisp + (setq-default dotspacemacs-enable-server t) +#+END_SRC ** Connecting to the Emacs server You can open a file in Emacs from the terminal using =emacsclient=. Use @@ -3689,14 +3693,6 @@ server is to use the following bindings: | ~SPC q t~ | Restart Emacs and debug with --with-timed-requires | | ~SPC q T~ | Restart Emacs and debug with --adv-timers | -** Disabling the Emacs server -You can disable the built-in server by setting the variable -=dotspacemacs-enable-server= to =nil= in your =~/.spacemacs=. - -#+BEGIN_SRC emacs-lisp - (setq-default dotspacemacs-enable-server nil) -#+END_SRC - * Troubleshoot ** Loading fails If any errors happen during the loading the mode-line will turn red and the