diff options
| author | Richard M. Stallman | 1993-11-13 23:59:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-11-13 23:59:53 +0000 |
| commit | 3ac14ca02a562b2489356d8b34b261ac36fd4068 (patch) | |
| tree | ad612932b0f8fb4727f57b8a080718110958b088 | |
| parent | ff383ac0d746eae992b1c3a2134b0ce9b4244fe1 (diff) | |
| download | emacs-3ac14ca02a562b2489356d8b34b261ac36fd4068.tar.gz emacs-3ac14ca02a562b2489356d8b34b261ac36fd4068.zip | |
(calendar-absolute-from-time): Undo Sep 14 patch.
Fix comments instead, since they didn't match the code.
| -rw-r--r-- | lisp/calendar/cal-dst.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index d480914ded8..a4c666eac5e 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el | |||
| @@ -63,8 +63,8 @@ absolute date ABS-DATE is the equivalent moment to X." | |||
| 63 | (cons (+ calendar-system-time-basis | 63 | (cons (+ calendar-system-time-basis |
| 64 | ;; floor((2^16 h +l) / (60*60*24)) | 64 | ;; floor((2^16 h +l) / (60*60*24)) |
| 65 | (* 512 (floor h 675)) (floor u 675)) | 65 | (* 512 (floor h 675)) (floor u 675)) |
| 66 | ;; (2^16 h +l) % (60*60*24) | 66 | ;; (2^16 h +l) mod (60*60*24) |
| 67 | (+ (* (% u 675) 128) (% l 128))))) | 67 | (+ (* (mod u 675) 128) (mod l 128))))) |
| 68 | 68 | ||
| 69 | (defun calendar-time-from-absolute (abs-date s) | 69 | (defun calendar-time-from-absolute (abs-date s) |
| 70 | "Time of absolute date ABS-DATE, S seconds after midnight. | 70 | "Time of absolute date ABS-DATE, S seconds after midnight. |
| @@ -77,9 +77,9 @@ midnight UTC on absolute date ABS-DATE." | |||
| 77 | (u (+ (* 163 (mod a 512)) (floor s 128)))) | 77 | (u (+ (* 163 (mod a 512)) (floor s 128)))) |
| 78 | ;; Overflow is a terrible thing! | 78 | ;; Overflow is a terrible thing! |
| 79 | (cons | 79 | (cons |
| 80 | ;; (60*60*24*a + s) / 2^16 | 80 | ;; floor((60*60*24*a + s) / 2^16) |
| 81 | (+ a (* 163 (floor a 512)) (floor u 512)) | 81 | (+ a (* 163 (floor a 512)) (floor u 512)) |
| 82 | ;; (60*60*24*a + s) % 2^16 | 82 | ;; (60*60*24*a + s) mod 2^16 |
| 83 | (+ (* 128 (mod u 512)) (mod s 128))))) | 83 | (+ (* 128 (mod u 512)) (mod s 128))))) |
| 84 | 84 | ||
| 85 | (defun calendar-next-time-zone-transition (time) | 85 | (defun calendar-next-time-zone-transition (time) |