Mercurial > emacs

changeset 102132:39b2e6feb768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(server-start): Make the warning more verbose (Bug#2395).
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 20 Feb 2009 02:16:25 +0000
parents d31ea613f989
children 2eec802705ee
files lisp/server.el
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/server.el	Fri Feb 20 02:14:39 2009 +0000
+++ b/lisp/server.el	Fri Feb 20 02:16:25 2009 +0000
@@ -493,9 +493,14 @@
 	  ;; Remove any leftover socket or authentication file
 	  (ignore-errors (delete-file server-file))
 	(setq server-mode nil) ;; already set by the minor mode code
-	(display-warning 'server
-			 (format "Emacs server named %S already running" server-name)
-			 :warning)
+	(display-warning
+	 'server
+	 (concat "Unable to start the Emacs server.\n"
+		 (format "There is an existing Emacs server, named %S.\n"
+			 server-name)
+		 "To start the server in this Emacs process, stop the existing
+server or call `M-x server-force-delete' to forcibly disconnect it.")
+	 :warning)
 	(setq leave-dead t))
       ;; If this Emacs already had a server, clear out associated status.
       (while server-clients