diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-30 13:03:22 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-30 13:03:22 +0200 |
| commit | 608832acc35420fc7140f73cd8e18f1a00f93ec6 (patch) | |
| tree | 22f5b8f3c5d2cd94bf23514affa86daa7392b63a /lisp/calc | |
| parent | 3c4eb0d190ec5d28d5798b346fcde701fd919d1b (diff) | |
| download | emacs-608832acc35420fc7140f73cd8e18f1a00f93ec6.tar.gz | |
Use decoded time accessors in calc
* lisp/calc/calc-forms.el (calc-time, math-this-year)
(calcFunc-now): Use decoded time accessors.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-forms.el | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index eb1a8248cdf..d867ac1d47a 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -41,7 +41,9 @@ (calc-enter-result 0 "time" (list 'mod (list 'hms - (nth 2 time) (nth 1 time) (nth 0 time)) + (decoded-time-hour time) + (decoded-time-minute time) + (decoded-time-second 0 time)) (list 'hms 24 0 0)))))) (defun calc-to-hms (arg) @@ -523,7 +525,7 @@ in the Gregorian calendar and the remaining part determines the time." (defun math-this-year () - (nth 5 (decode-time))) + (decoded-time-year (decode-time))) (defun math-leap-year-p (year &optional julian) "Non-nil if YEAR is a leap year. @@ -1341,8 +1343,12 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)." (defun calcFunc-now (&optional zone) (let ((date (let ((now (decode-time))) (list 'date (math-dt-to-date - (list (nth 5 now) (nth 4 now) (nth 3 now) - (nth 2 now) (nth 1 now) (nth 0 now))))))) + (list (decoded-time-year now) + (decoded-time-month now) + (decoded-time-day now) + (decoded-time-hour now) + (decoded-time-minute now) + (decoded-time-second now))))))) (if zone (math-add date (math-div (math-sub (calcFunc-tzone nil date) (calcFunc-tzone zone date)) |