diff options
| author | Po Lu <luangruo@yahoo.com> | 2021-12-06 17:24:28 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2021-12-06 17:24:28 +0800 |
| commit | 9eba6b966e330a38bdc3fef5e36b8a2904e72785 (patch) | |
| tree | 4018079e38cd5eb22c33b497cf777784b7647b8e /lisp/emacs-lisp/timer.el | |
| parent | 7314c12e64ef5b185e3fd52d8dc1111eb730bdad (diff) | |
| parent | c1145c31adf143460911dd87b408d35ea88a1a92 (diff) | |
| download | emacs-9eba6b966e330a38bdc3fef5e36b8a2904e72785.tar.gz emacs-9eba6b966e330a38bdc3fef5e36b8a2904e72785.tar.bz2 emacs-9eba6b966e330a38bdc3fef5e36b8a2904e72785.zip | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 2ac2c992456..c7d02cc7487 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -314,7 +314,7 @@ This function is called, by name, directly by the C code." (not (timer--idle-delay timer))) (setf (timer--time timer) (timer-next-integral-multiple-of-time - (current-time) (timer--repeat-delay timer)))) + nil (timer--repeat-delay timer)))) ;; Place it back on the timer-list before running ;; timer--function, so it can cancel-timer itself. (timer-activate timer t cell) @@ -391,7 +391,7 @@ This function returns a timer object which you can use in ;; Special case: t means the next integral multiple of REPEAT. (when (and (eq time t) repeat) - (setq time (timer-next-integral-multiple-of-time (current-time) repeat)) + (setq time (timer-next-integral-multiple-of-time nil repeat)) (setf (timer--integral-multiple timer) t)) ;; Handle numbers as relative times in seconds. |