[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el,v |
Date: |
Sun, 21 Sep 2008 23:31:51 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/09/21 23:31:48
Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -b -r1.503 -r1.504
--- lisp/startup.el 23 Aug 2008 16:59:19 -0000 1.503
+++ lisp/startup.el 21 Sep 2008 23:31:45 -0000 1.504
@@ -881,9 +881,15 @@
(run-hooks 'before-init-hook)
+ (if (daemonp)
+ ;; Just start the server here, no need to run
+ ;; `frame-initialize', it deals with creating a frame and
+ ;; setting the parameters for the initial frame, we don't need
+ ;; any oxof those.
+ (server-start)
;; Under X Window, this creates the X frame and deletes the terminal frame.
(when (fboundp 'frame-initialize)
- (frame-initialize))
+ (frame-initialize)))
;; Turn off blinking cursor if so specified in X resources. This is here
;; only because all other settings of no-blinking-cursor are here.
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v,
Dan Nicolaescu <=