[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/10/27 07:02:36

Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -b -r1.517 -r1.518
--- lisp/startup.el     26 Oct 2008 19:05:50 -0000      1.517
+++ lisp/startup.el     27 Oct 2008 07:02:34 -0000      1.518
@@ -693,6 +693,8 @@
 (declare-function tool-bar-mode "tool-bar" (&optional arg))
 (declare-function tool-bar-setup "tool-bar")
 
+(defvar server-name)
+
 (defun command-line ()
   (setq before-init-time (current-time)
        after-init-time nil
@@ -1212,9 +1214,11 @@
   ;; This is done after loading the user's init file and after
   ;; processing all command line arguments to allow e.g. `server-name'
   ;; to be changed before the server starts.
-  (when (daemonp)
+  (let ((dn (daemonp)))
+    (when dn
+      (when (stringp dn) (setq server-name dn))
     (server-start)
-    (daemon-initialized))
+      (daemon-initialized)))
 
   ;; Run emacs-session-restore (session management) if started by
   ;; the session manager and we have a session manager connection.