[Emacs-diffs] emacs/lisp server.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/02/20 02:16:26

Modified files:
        lisp           : server.el 

Log message:
        (server-start): Make the warning more verbose (Bug#2395).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.189&r2=1.190

Patches:
Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- server.el   11 Feb 2009 09:23:02 -0000      1.189
+++ server.el   20 Feb 2009 02:16:25 -0000      1.190
@@ -493,8 +493,13 @@
          ;; 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)
+       (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.