diff options
| author | Stephen Leake <stephen_leake@stephe-leake.org> | 2019-07-30 11:03:15 -0700 |
|---|---|---|
| committer | Stephen Leake <stephen_leake@stephe-leake.org> | 2019-07-30 11:03:15 -0700 |
| commit | 01739625704aaaea6831cef459a4a53171689513 (patch) | |
| tree | ef9f324b3fa6696647c6e637e436ee6160155b92 /lisp/emacs-lisp/timer.el | |
| parent | 056cbcb7a959463290bc91c19b909cbf3eb47d0a (diff) | |
| parent | 9b480db6732c6d2e886838f112d9bd46fc8989bf (diff) | |
| download | emacs-01739625704aaaea6831cef459a4a53171689513.tar.gz emacs-01739625704aaaea6831cef459a4a53171689513.tar.bz2 emacs-01739625704aaaea6831cef459a4a53171689513.zip | |
Merge commit '9b480db6732c6d2e886838f112d9bd46fc8989bf'
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 22ccc35103a..400f00a85b5 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -375,8 +375,11 @@ This function returns a timer object which you can use in (now (decode-time))) (if (>= hhmm 0) (setq time - (encode-time 0 (% hhmm 100) (/ hhmm 100) (nth 3 now) - (nth 4 now) (nth 5 now) (nth 8 now))))))) + (encode-time 0 (% hhmm 100) (/ hhmm 100) + (decoded-time-day now) + (decoded-time-month now) + (decoded-time-year now) + (decoded-time-zone now))))))) (or (consp time) (error "Invalid time format")) |