From: Glenn Morris Date: Sat, 16 Feb 2008 22:21:18 +0000 (+0000) Subject: (emacs-uptime): Use before-init-time rather than emacs-startup-time. X-Git-Tag: emacs-pretest-23.0.90~7914 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e279593d41d1992ccde70cf7e5698c53c6e076d4;p=emacs.git (emacs-uptime): Use before-init-time rather than emacs-startup-time. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08664b7b346..ae9b0072d04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -32,6 +32,12 @@ 2008-02-16 Glenn Morris + * 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 dc4e500cddc..0613e1586bc 100644 --- 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)))