diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-20 22:45:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-20 22:45:36 -0700 |
| commit | f400c7b69714c91a714ff0ab5b9f16708daf49b9 (patch) | |
| tree | 4a6549c67213696481b659654cac312f204f9479 /lisp/subr.el | |
| parent | 8cedc552463358509dd785f54e58bfaf8099de62 (diff) | |
| parent | 868eb74f910eb67a5e74ebb1867ebcfbfced55c4 (diff) | |
| download | emacs-f400c7b69714c91a714ff0ab5b9f16708daf49b9.tar.gz | |
Merge from origin/emacs-26
868eb74f91 Simplify make-progress-reporter vs float-time
83db9a1bba Fix two more minor Gnus typos
e655946ce0 Fix two minor Gnus typos
6a00914d6d Tweak Fdocumentation's error for an undefined function
7c63655e39 Tweak format of list of old files in NEWS header
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index a6c998e9be2..b6b55b53def 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4820,10 +4820,9 @@ CURRENT-VALUE and MIN-CHANGE do not have any effect if MIN-VALUE and/or MAX-VALUE are nil. Optional MIN-TIME specifies the minimum interval time between -echo area updates (default is 0.2 seconds.) If the function -`float-time' is not present, time is not tracked at all. If the -OS is not capable of measuring fractions of seconds, this -parameter is effectively rounded up." +echo area updates (default is 0.2 seconds.) If the OS is not +capable of measuring fractions of seconds, this parameter is +effectively rounded up." (when (string-match "[[:alnum:]]\\'" message) (setq message (concat message "..."))) (unless min-time @@ -4831,8 +4830,7 @@ parameter is effectively rounded up." (let ((reporter ;; Force a call to `message' now (cons (or min-value 0) - (vector (if (and (fboundp 'float-time) - (>= min-time 0.02)) + (vector (if (>= min-time 0.02) (float-time) nil) min-value max-value |