[Emacs-diffs] emacs/lisp ChangeLog server.el startup.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/12/16 21:23:08

Modified files:
        lisp           : ChangeLog server.el startup.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14952&r2=1.14953
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.523&r2=1.524

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14952
retrieving revision 1.14953
diff -u -b -r1.14952 -r1.14953
--- ChangeLog   15 Dec 2008 18:31:59 -0000      1.14952
+++ ChangeLog   16 Dec 2008 21:23:03 -0000      1.14953
@@ -1,3 +1,12 @@
+2008-12-16  Juanma Barranquero  <address@hidden>
+
+       * 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.
+
 2008-12-15  Sam Steingold  <address@hidden>
 
        * progmodes/cc-cmds.el (c-defun-name): Handle DEFFOO(name,...),

Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- server.el   12 Dec 2008 00:33:34 -0000      1.176
+++ server.el   16 Dec 2008 21:23:07 -0000      1.177
@@ -479,14 +479,17 @@
          ;; 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)

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -b -r1.523 -r1.524
--- startup.el  22 Nov 2008 20:44:42 -0000      1.523
+++ startup.el  16 Dec 2008 21:23:08 -0000      1.524
@@ -694,6 +694,7 @@
 (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 @@
     (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.