diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/server.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 90d97c1538e..553890ce299 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -670,7 +670,6 @@ the `server-process' variable." "/tmp/") (ignore-errors (delete-directory (file-name-directory server-file)))))) - (setq server-mode nil) ;; already set by the minor mode code (display-warning 'server (concat "Unable to start the Emacs server.\n" @@ -688,7 +687,9 @@ server or call `\\[server-force-delete]' to forcibly disconnect it.")) (if leave-dead (progn (unless (eq t leave-dead) (server-log (message "Server stopped"))) - (setq server-process nil)) + (setq server-mode nil + global-minor-modes (delq 'server-mode global-minor-modes) + server-process nil)) ;; Make sure there is a safe directory in which to place the socket. (server-ensure-safe-dir server-dir) (when server-process @@ -728,6 +729,8 @@ server or call `\\[server-force-delete]' to forcibly disconnect it.")) :plist '(:authenticated t))))) (unless server-process (error "Could not start server process")) (process-put server-process :server-file server-file) + (setq server-mode t) + (push 'server-mode global-minor-modes) (when server-use-tcp (let ((auth-key (server-get-auth-key))) (process-put server-process :auth-key auth-key) @@ -796,6 +799,10 @@ by the current Emacs process, use the `server-process' variable." t) (file-error nil))) +;; This keymap is empty, but allows users to define keybindings to use +;; when `server-mode' is active. +(defvar-keymap server-mode-map) + ;;;###autoload (define-minor-mode server-mode "Toggle Server mode. @@ -805,6 +812,7 @@ Server mode runs a process that accepts commands from the `server-start' for details." :global t :version "22.1" + :keymap server-mode-map ;; Fixme: Should this check for an existing server socket and do ;; nothing if there is one (for multiple Emacs sessions)? (server-start (not server-mode))) |