diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/time.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/time.el')
| -rw-r--r-- | lisp/time.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/time.el b/lisp/time.el index 9f25f99a149..8496adec228 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -340,7 +340,7 @@ Switches from the 1 to 5 to 15 minute load average, and then back to 1." (float-time end-time)))))))))) (defun display-time-update () - "Update the display-time info for the mode line. + "Update the `display-time' info for the mode line. However, don't redisplay right now. This is used for things like Rmail `g' that want to force an @@ -626,7 +626,7 @@ point." ;;;###autoload (defun emacs-init-time (&optional format) "Return a string giving the duration of the Emacs initialization. -FORMAT is a string to format the result, using `format'. If nil, +FORMAT is a string to format the result, using `format'. If nil, the default format \"%f seconds\" is used." (interactive) (let ((str (format (or format "%f seconds") |