]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix typo.
authorJay Belanger <jay.p.belanger@gmail.com>
Mon, 3 Dec 2012 01:05:08 +0000 (19:05 -0600)
committerJay Belanger <jay.p.belanger@gmail.com>
Mon, 3 Dec 2012 01:05:08 +0000 (19:05 -0600)
lisp/calc/calc-forms.el

index 9915799002f0e649fefbf65362f98472d7facdd3..197bc6acee564bda191a79a96cde156542d99eb9 100644 (file)
@@ -465,13 +465,13 @@ in the Gregorian calendar and the remaining part determines the time."
                          (let ((y approx)
                                (sum 0))
                            (while (>= (math-compare date 
-                                                    (math-iso-dt-to-absolute (setq y (math-add y 1)) 1 1)) 0)
+                                                    (math-absolute-from-iso-dt (setq y (math-add y 1)) 1 1)) 0)
                              (setq sum (+ sum 1)))
                            sum))))
     (list 
      year
      (math-add (car (math-idivmod 
-                     (math-sub date (math-iso-dt-to-absolute year 1 1))
+                     (math-sub date (math-absolute-from-iso-dt year 1 1))
                      7))
                1)
      (cdr (math-idivmod date 7)))))
@@ -739,8 +739,6 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
          (progn
            (or math-fd-iso-dt
                (setq math-fd-iso-dt (math-date-to-iso-dt math-fd-date)
-                     jpb math-fd-date
-                     jpbb math-fd-iso-dt
                      math-fd-isoyear (car math-fd-iso-dt)
                      math-fd-isoweek (nth 1 math-fd-iso-dt)
                      math-fd-isoweekday (nth 2 math-fd-iso-dt)))