Commit 04e56139 authored by Glenn Morris's avatar Glenn Morris
Browse files

(emacs-uptime): Add optional `format' argument. Doc fix. Use `%z'

rather than removed `nonzero' argument of format-seconds.
parent 99d8d540
2008-02-16 Glenn Morris <rgm@gnu.org>
* composite.el (composition-function-table): Doc fix.
* calendar/time-date.el (format-seconds): Remove `nonzero' argument
in favor of `%z' specifier.
(emacs-uptime): Move to time.el.
* time.el (emacs-uptime): Move here from time-date.el. Add
optional `format' argument. Doc fix. Use `%z' rather than
removed `nonzero' argument of format-seconds.
2008-02-16 Dan Nicolaescu <dann@ics.uci.edu>
 
* bindings.el (mode-line-mule-info): Make the tooltips more explicit.
......
......@@ -550,14 +550,15 @@ To turn off the world time display, go to that window and type `q'."
;;;###autoload
(defun emacs-uptime ()
"Return a string giving the uptime of this instance of Emacs."
(defun emacs-uptime (&optional format)
"Return a string giving the uptime of this instance of Emacs.
FORMAT is a string to format the result, using `format-seconds'.
For example, the Unix uptime command format is \"%D, %z%2h:%.2m\"."
(interactive)
(let ((str
(format-seconds "%Y, %D, %H, %M, %S"
(format-seconds (or format "%Y, %D, %H, %M, %z%S")
(time-to-seconds
(time-subtract (current-time) emacs-startup-time))
t)))
(time-subtract (current-time) emacs-startup-time)))))
(if (interactive-p)
(message "%s" str)
str)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment