X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=timezone.el;h=333bd9095d1c5a6f53d65900c17a3829cc7d9064;hb=003d8ceb738c593c1946147fdb11be6409b7f725;hp=59bb09190fef5b53c0358f9f1d863393e30d544a;hpb=49556b1eb338487d82a3c463aa583e9d13fda6b2;p=elisp%2Fapel.git diff --git a/timezone.el b/timezone.el index 59bb091..333bd90 100644 --- a/timezone.el +++ b/timezone.el @@ -409,7 +409,7 @@ If TIMEZONE is nil, use the local time zone." (diff (- (timezone-zone-to-minute timezone) (timezone-zone-to-minute local))) (minute (+ minute diff)) - (hour-fix (timezone-floor minute 60))) + (hour-fix (floor minute 60))) (setq hour (+ hour hour-fix)) (setq minute (- minute (* 60 hour-fix))) ;; HOUR may be larger than 24 or smaller than 0. @@ -487,17 +487,6 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary." (- (/ (1- year) 100));; - century years (/ (1- year) 400)));; + Gregorian leap years -(defun timezone-floor (n &optional divisor) - "Return the largest integer no grater than N. -With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR." - (if (fboundp 'floor) - (floor n divisor) - (if (null divisor) - (setq divisor 1)) - (if (< n 0) - (- (/ (- divisor 1 n) divisor)) - (/ n divisor)))) - ;;; @ End. ;;;