diff options
| author | Karl Heuer <[email protected]> | 1997-12-04 04:13:58 +0000 |
|---|---|---|
| committer | Karl Heuer <[email protected]> | 1997-12-04 04:13:58 +0000 |
| commit | 54e7fabaf3b72407b1081e63e66f12457b92f742 (patch) | |
| tree | be6d4a910ae2e73865f851fed27e9606f86721f7 /lisp/calendar/cal-french.el | |
| parent | 23ce24865924d59a44e36cd50a48fad308261f7d (diff) | |
(french-calendar-special-days-array): New function.
(calendar-french-date-string, calendar-goto-french-date): Use that
function instead of the variable.
Diffstat (limited to 'lisp/calendar/cal-french.el')
| -rw-r--r-- | lisp/calendar/cal-french.el | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index 34743c3568..3b326526dc 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -62,6 +62,11 @@ ["Vend�miaire" "Brumaire" "Frimaire" "Niv�se" "Pluvi�se" "Vent�se" "Germinal" "Flor�al" "Prairial" "Messidor" "Thermidor" "Fructidor"]) +(defun french-calendar-month-name-array () + (if (french-calendar-accents) + french-calendar-multibyte-month-name-array + french-calendar-month-name-array)) + (defconst french-calendar-day-name-array ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" "Octidi" "Nonidi" "Decadi"]) @@ -70,11 +75,6 @@ ["de la Vertu" "du G�nie" "du Labour" "de la Raison" "de la R�compense" "de la R�volution"]) -(defun french-calendar-month-name-array () - (if (french-calendar-accents) - french-calendar-multibyte-month-name-array - french-calendar-month-name-array)) - (defun french-calendar-day-name-array () french-calendar-day-name-array) @@ -82,6 +82,11 @@ ["de la Vertu" "du Ge'nie" "du Labour" "de la Raison" "de la Re'compense" "de la Re'volution"]) +(defun french-calendar-special-days-array () + (if (french-calendar-accents) + french-calendar-multibyte-special-days-array + french-calendar-special-days-array)) + (defun french-calendar-leap-year-p (year) "True if YEAR is a leap year on the French Revolutionary calendar. For Gregorian years 1793 to 1805, the years of actual operation of the @@ -169,7 +174,7 @@ Defaults to today's date if DATE is not given." ((= m 13) (format (if (french-calendar-accents) "Jour %s de l'Ann�e %d de la R�volution" "Jour %s de l'Anne'e %d de la Re'volution") - (aref french-calendar-special-days-array (1- d)) + (aref (french-calendar-special-days-array) (1- d)) y)) (t (format (if (french-calendar-accents) @@ -214,13 +219,13 @@ Echo French Revolutionary date unless NOECHO is t." (if (french-calendar-leap-year-p year) (mapcar '(lambda (x) (concat "Jour " x)) - french-calendar-special-days-array) + (french-calendar-special-days-array)) (reverse (cdr;; we don't want rev. day in a non-leap yr. (reverse (mapcar '(lambda (x) (concat "Jour " x)) - french-calendar-special-days-array)))))))) + (french-calendar-special-days-array))))))))) (completion-ignore-case t) (month (cdr (assoc (capitalize |