(emacs-uptime): Use before-init-time rather than emacs-startup-time.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08664b7b3460cb2110735e9021456ed2184f7c7d..ae9b0072d047824fe43c0bb71d29972cf1615c71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -32,6 +32,12 @@
 
 2008-02-16  Glenn Morris  <rgm@gnu.org>
 
+       * startup.el (emacs-startup-time): Rename to `before-init-time'.
+       (before-init-time): New name for `emacs-startup-time'.
+       (command-line): Use before-init-time rather than emacs-startup-time.
+       * time.el (emacs-uptime): Use before-init-time rather than
+       emacs-startup-time.
+
        * composite.el (composition-function-table): Doc fix.
 
        * calendar/time-date.el (format-seconds): Remove `nonzero' argument

diff --git a/lisp/time.el b/lisp/time.el
index dc4e500cddcbd07a789572450860570d21c406d9..0613e1586bc6416ccb1fef522af1ef8040333e4d 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -558,7 +558,7 @@ For example, the Unix uptime command format is \"%D, %z%2h:%.2m\"."
   (let ((str
          (format-seconds (or format "%Y, %D, %H, %M, %z%S")
                          (time-to-seconds
-                          (time-subtract (current-time) emacs-startup-time)))))
+                          (time-subtract (current-time) before-init-time)))))
     (if (interactive-p)
         (message "%s" str)
       str)))