diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-12-16 21:23:03 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-12-16 21:23:03 +0000 |
| commit | 35f372cadfaf129d62e81951d4516c687b67d189 (patch) | |
| tree | a661183445da2badfb1a5a45b82ab38699b5d727 /lisp/server.el | |
| parent | eec5eeade775a34cfdaf45a47c6b50be3a8e8398 (diff) | |
| download | emacs-35f372cadfaf129d62e81951d4516c687b67d189.tar.gz | |
* server.el (server-start): If unable to start the server,
display a warning instead of raising an error.
* startup.el (server-process): Add defvar.
(command-line): If the daemon is unable to start the server,
display a message and exit Emacs.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 627805da66c..f8c405b1305 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -479,14 +479,17 @@ To force-start a server, do \\[server-force-delete] and then ;; Remove any leftover socket or authentication file (ignore-errors (delete-file server-file)) (setq server-mode nil) ;; already set by the minor mode code - (error "Server %S is already running" server-name)) + (display-warning 'server + (format "Emacs server named %S already running" server-name) + :warning) + (setq leave-dead t)) ;; If this Emacs already had a server, clear out associated status. (while server-clients (server-delete-client (car server-clients))) ;; Now any previous server is properly stopped. (if leave-dead (progn - (server-log (message "Server stopped")) + (unless (eq t leave-dead) (server-log (message "Server stopped"))) (setq server-process nil)) ;; Make sure there is a safe directory in which to place the socket. (server-ensure-safe-dir server-dir) |