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/startup.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/startup.el')
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index f328a914584..2fa1a6c15cd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -694,6 +694,7 @@ opening the first frame (e.g. open a connection to an X server).") (declare-function tool-bar-setup "tool-bar") (defvar server-name) +(defvar server-process) (defun command-line () (setq before-init-time (current-time) @@ -1220,7 +1221,10 @@ the `--debug-init' option to view a complete error backtrace." (when dn (when (stringp dn) (setq server-name dn)) (server-start) - (daemon-initialized))) + (if server-process + (daemon-initialized) + (message "Unable to start daemon: Emacs server named %S already running" server-name) + (kill-emacs 1)))) ;; Run emacs-session-restore (session management) if started by ;; the session manager and we have a session manager connection. |