Mercurial > emacs
diff lisp/calendar/cal-french.el @ 93809:3ff2b47de8f2
Update for calendar.el name changes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 07 Apr 2008 01:59:37 +0000 |
parents | 1eed5494bf3f |
children | bf9ef749c23e |
line wrap: on
line diff
--- a/lisp/calendar/cal-french.el Mon Apr 07 01:58:55 2008 +0000 +++ b/lisp/calendar/cal-french.el Mon Apr 07 01:59:37 2008 +0000 @@ -114,9 +114,9 @@ "Compute absolute date from French Revolutionary date DATE. The absolute date is the number of days elapsed since the (imaginary) Gregorian date Sunday, December 31, 1 BC." - (let ((month (extract-calendar-month date)) - (day (extract-calendar-day date)) - (year (extract-calendar-year date))) + (let ((month (calendar-extract-month date)) + (day (calendar-extract-day date)) + (year (calendar-extract-year date))) (+ (* 365 (1- year)) ; days in prior years ;; Leap days in prior years. (if (< year 20) @@ -170,9 +170,9 @@ (let* ((french-date (calendar-french-from-absolute (calendar-absolute-from-gregorian (or date (calendar-current-date))))) - (y (extract-calendar-year french-date)) - (m (extract-calendar-month french-date)) - (d (extract-calendar-day french-date))) + (y (calendar-extract-year french-date)) + (m (calendar-extract-month french-date)) + (d (calendar-extract-day french-date))) (cond ((< y 1) "") ((= m 13) (format (if (calendar-french-accents-p) @@ -214,7 +214,7 @@ "Anne'e de la Re'volution (>0): ") (lambda (x) (> x 0)) (int-to-string - (extract-calendar-year + (calendar-extract-year (calendar-french-from-absolute (calendar-absolute-from-gregorian (calendar-current-date))))))))