[Emacs-diffs] Changes to emacs/lisp/calendar/cal-french.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/07 01:59:37

Index: cal-french.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-french.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- cal-french.el       6 Apr 2008 20:43:40 -0000       1.47
+++ cal-french.el       7 Apr 2008 01:59:36 -0000       1.48
@@ -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))))))))