Commit 5424a530 authored by Glenn Morris's avatar Glenn Morris
Browse files

(french-calendar-accents): Move definition after constants.

(french-calendar-epoch, calendar-goto-french-date): Doc fix.
(french-calendar-month-name-array)
(french-calendar-multibyte-month-name-array)
(french-calendar-day-name-array, french-calendar-special-days-array):
Add doc strings.
parent 52e0f59e
......@@ -22,6 +22,13 @@
(ethiopic-calendar-month-name-array, ethiopic-name): Add doc strings.
(coptic-prompt-for-date): Move definition before use.
 
* calendar/cal-french.el (french-calendar-epoch)
(calendar-goto-french-date): Doc fix.
(french-calendar-month-name-array)
(french-calendar-multibyte-month-name-array)
(french-calendar-day-name-array, french-calendar-special-days-array):
Add doc strings.
* calendar/cal-persia.el (calendar-goto-persian-date): Doc fix.
 
* calendar/diary-lib.el (mark-diary-entries): Move some constant
......
......@@ -41,36 +41,41 @@
(require 'calendar)
(defun french-calendar-accents ()
"True if diacritical marks are available."
(and (or window-system
(terminal-coding-system))
(or enable-multibyte-characters
(and (char-table-p standard-display-table)
(equal (aref standard-display-table 161) [161])))))
(defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792))
"Absolute date of start of French Revolutionary calendar = September 22, 1792.")
"Absolute date of start of French Revolutionary calendar = Sept 22, 1792.")
(defconst french-calendar-month-name-array
["Vende'miaire" "Brumaire" "Frimaire" "Nivo^se" "Pluvio^se" "Vento^se"
"Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"])
"Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"]
"Array of month names in the French calendar.")
(defconst french-calendar-multibyte-month-name-array
["Vendmiaire" "Brumaire" "Frimaire" "Nivse" "Pluvise" "Ventse"
"Germinal" "Floral" "Prairial" "Messidor" "Thermidor" "Fructidor"])
"Germinal" "Floral" "Prairial" "Messidor" "Thermidor" "Fructidor"]
"Array of multibyte month names in the French calendar.")
(defconst french-calendar-day-name-array
["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi"
"Octidi" "Nonidi" "Decadi"])
"Octidi" "Nonidi" "Decadi"]
"Array of day names in the French calendar.")
(defconst french-calendar-special-days-array
["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses"
"de la Re'volution"]
"Array of special day names in the French calendar.")
(defconst french-calendar-multibyte-special-days-array
["de la Vertu" "du Gnie" "du Travail" "de la Raison" "des Rcompenses"
"de la Rvolution"])
"de la Rvolution"]
"Array of multibyte special day names in the French calendar.")
(defconst french-calendar-special-days-array
["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses"
"de la Re'volution"])
(defun french-calendar-accents ()
"True if diacritical marks are available."
(and (or window-system
(terminal-coding-system))
(or enable-multibyte-characters
(and (char-table-p standard-display-table)
(equal (aref standard-display-table 161) [161])))))
(defun french-calendar-month-name-array ()
"Return the array of month names, depending on whether accents are available."
......@@ -200,7 +205,7 @@ Defaults to today's date if DATE is not given."
;;;###cal-autoload
(defun calendar-goto-french-date (date &optional noecho)
"Move cursor to French Revolutionary date DATE.
Echo French Revolutionary date unless NOECHO is t."
Echo French Revolutionary date unless NOECHO is non-nil."
(interactive
(let ((accents (french-calendar-accents))
(months (french-calendar-month-name-array))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment