(calendar-absolute-from-time, calendar-time-from-absolute): Use % in place

of mod.  Use (floor (/ A B)) in place of (floor A B).

diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 62ca6b089a1f31be5c662a94874a2b9667feb104..4726ba1fd2398e873f5367edcc08bbf7ec60f11f 100644 (file)
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -58,13 +58,13 @@ absolute date ABS-DATE is the equivalent moment to X."
   (let* ((h (car x))
         (xtail (cdr x))
          (l (+ utc-diff (if (numberp xtail) xtail (car xtail))))
-         (u (+ (* 512 (mod h 675)) (floor l 128))))
+         (u (+ (* 512 (% h 675)) (floor (/ l 128)))))
     ;; Overflow is a terrible thing!
     (cons (+ calendar-system-time-basis
             ;; floor((2^16 h +l) / (60*60*24))
-            (* 512 (mod h 675)) (floor u 675))
+            (* 512 (% h 675)) (floor (/ u 675)))
          ;; (2^16 h +l) % (60*60*24)
-         (+ (* (mod u 675) 128) (floor l 128)))))
+         (+ (* (% u 675) 128) (floor (% l 128))))))
 
 (defun calendar-time-from-absolute (abs-date s)
   "Time of absolute date ABS-DATE, S seconds after midnight.
@@ -74,13 +74,13 @@ Returns the pair (HIGH . LOW) where HIGH and LOW are the high and low
 ignoring leap seconds, that is the equivalent moment to S seconds after
 midnight UTC on absolute date ABS-DATE."
   (let* ((a (- abs-date calendar-system-time-basis))
-         (u (+ (* 163 (mod a 512)) (floor s 128))))
+         (u (+ (* 163 (% a 512)) (floor (/ s 128)))))
     ;; Overflow is a terrible thing!
     (cons
      ;; (60*60*24*a + s) / 2^16
-     (+ a (* 163 (floor a 512)) (floor u 512))
+     (+ a (* 163 (floor (/ a 512))) (floor (/ u 512)))
      ;; (60*60*24*a + s) % 2^16
-     (+ (* 128 (mod u 512)) (mod s 128)))))
+     (+ (* 128 (% u 512)) (% s 128)))))
 
 (defun calendar-next-time-zone-transition (time)
   "Return the time of the next time zone transition after TIME.