aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-10-06 16:16:30 +0000
committerChong Yidong2008-10-06 16:16:30 +0000
commit981c5d1daab414a7a394aeb4761e657bccd273ed (patch)
tree95afb17d0ddfe5600bea65dc9da387cfe27e2eac
parent81fe0060d543031cde8708e492a2203c6676f38d (diff)
downloademacs-981c5d1daab414a7a394aeb4761e657bccd273ed.tar.gz
emacs-981c5d1daab414a7a394aeb4761e657bccd273ed.zip
(before-init-time, after-init-time): Move into emacs.c.
(command-line): Set after-init-time to nil before initialization.
-rw-r--r--lisp/startup.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 5bd73f9e889..fa21cca8776 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -257,12 +257,6 @@ There is no `condition-case' around the running of these functions;
257therefore, if you set `debug-on-error' non-nil in `.emacs', 257therefore, if you set `debug-on-error' non-nil in `.emacs',
258an error in one of these functions will invoke the debugger.") 258an error in one of these functions will invoke the debugger.")
259 259
260(defvar before-init-time nil
261 "Value of `current-time' before Emacs begins initialization.")
262
263(defvar after-init-time nil
264 "Value of `current-time' after loading the init files.")
265
266(defvar emacs-startup-hook nil 260(defvar emacs-startup-hook nil
267 "Normal hook run after loading init files and handling the command line.") 261 "Normal hook run after loading init files and handling the command line.")
268 262
@@ -700,6 +694,7 @@ opening the first frame (e.g. open a connection to an X server).")
700 694
701(defun command-line () 695(defun command-line ()
702 (setq before-init-time (current-time) 696 (setq before-init-time (current-time)
697 after-init-time nil
703 command-line-default-directory default-directory) 698 command-line-default-directory default-directory)
704 699
705 ;; Choose a reasonable location for temporary files. 700 ;; Choose a reasonable location for temporary files.