aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calc/calc-forms.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 9915799002f..197bc6acee5 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -465,13 +465,13 @@ in the Gregorian calendar and the remaining part determines the time."
465 (let ((y approx) 465 (let ((y approx)
466 (sum 0)) 466 (sum 0))
467 (while (>= (math-compare date 467 (while (>= (math-compare date
468 (math-iso-dt-to-absolute (setq y (math-add y 1)) 1 1)) 0) 468 (math-absolute-from-iso-dt (setq y (math-add y 1)) 1 1)) 0)
469 (setq sum (+ sum 1))) 469 (setq sum (+ sum 1)))
470 sum)))) 470 sum))))
471 (list 471 (list
472 year 472 year
473 (math-add (car (math-idivmod 473 (math-add (car (math-idivmod
474 (math-sub date (math-iso-dt-to-absolute year 1 1)) 474 (math-sub date (math-absolute-from-iso-dt year 1 1))
475 7)) 475 7))
476 1) 476 1)
477 (cdr (math-idivmod date 7))))) 477 (cdr (math-idivmod date 7)))))
@@ -739,8 +739,6 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
739 (progn 739 (progn
740 (or math-fd-iso-dt 740 (or math-fd-iso-dt
741 (setq math-fd-iso-dt (math-date-to-iso-dt math-fd-date) 741 (setq math-fd-iso-dt (math-date-to-iso-dt math-fd-date)
742 jpb math-fd-date
743 jpbb math-fd-iso-dt
744 math-fd-isoyear (car math-fd-iso-dt) 742 math-fd-isoyear (car math-fd-iso-dt)
745 math-fd-isoweek (nth 1 math-fd-iso-dt) 743 math-fd-isoweek (nth 1 math-fd-iso-dt)
746 math-fd-isoweekday (nth 2 math-fd-iso-dt))) 744 math-fd-isoweekday (nth 2 math-fd-iso-dt)))