From 04e5613961922a9bd83f1255781b04b7a85dd8a9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 16 Feb 2008 03:31:19 +0000 Subject: [PATCH] (emacs-uptime): Add optional `format' argument. Doc fix. Use `%z' rather than removed `nonzero' argument of format-seconds. --- lisp/ChangeLog | 11 +++++++++++ lisp/time.el | 11 ++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cdf82a55cd..35670906e20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2008-02-16 Glenn Morris + + * 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 * bindings.el (mode-line-mule-info): Make the tooltips more explicit. diff --git a/lisp/time.el b/lisp/time.el index c9ca2059b7b..dc4e500cddc 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -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)))