diff options
| author | Paul Eggert | 2017-10-20 20:13:09 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-10-20 20:14:33 -0700 |
| commit | 868eb74f910eb67a5e74ebb1867ebcfbfced55c4 (patch) | |
| tree | 2e2f7b3a0576d5fdc8cf856685c2f3e430069a42 | |
| parent | 83db9a1bba20575303fd01f8e67d5c6e09e3d72a (diff) | |
| download | emacs-868eb74f910eb67a5e74ebb1867ebcfbfced55c4.tar.gz emacs-868eb74f910eb67a5e74ebb1867ebcfbfced55c4.zip | |
Simplify make-progress-reporter vs float-time
* lisp/subr.el (make-progress-reporter): Remove no-longer-needed
doc and code for the case where float-time is not supported,
since float-time is always present now.
| -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 c216877ce5f..49fffad7fe6 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 | |||
| 4820 | and/or MAX-VALUE are nil. | 4820 | and/or MAX-VALUE are nil. |
| 4821 | 4821 | ||
| 4822 | Optional MIN-TIME specifies the minimum interval time between | 4822 | Optional MIN-TIME specifies the minimum interval time between |
| 4823 | echo area updates (default is 0.2 seconds.) If the function | 4823 | echo area updates (default is 0.2 seconds.) If the OS is not |
| 4824 | `float-time' is not present, time is not tracked at all. If the | 4824 | capable of measuring fractions of seconds, this parameter is |
| 4825 | OS is not capable of measuring fractions of seconds, this | 4825 | effectively rounded up." |
| 4826 | parameter is effectively rounded up." | ||
| 4827 | (when (string-match "[[:alnum:]]\\'" message) | 4826 | (when (string-match "[[:alnum:]]\\'" message) |
| 4828 | (setq message (concat message "..."))) | 4827 | (setq message (concat message "..."))) |
| 4829 | (unless min-time | 4828 | (unless min-time |
| @@ -4831,8 +4830,7 @@ parameter is effectively rounded up." | |||
| 4831 | (let ((reporter | 4830 | (let ((reporter |
| 4832 | ;; Force a call to `message' now | 4831 | ;; Force a call to `message' now |
| 4833 | (cons (or min-value 0) | 4832 | (cons (or min-value 0) |
| 4834 | (vector (if (and (fboundp 'float-time) | 4833 | (vector (if (>= min-time 0.02) |
| 4835 | (>= min-time 0.02)) | ||
| 4836 | (float-time) nil) | 4834 | (float-time) nil) |
| 4837 | min-value | 4835 | min-value |
| 4838 | max-value | 4836 | max-value |