aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calendar/cal-french.el17
1 files changed, 12 insertions, 5 deletions
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b08f0b4ab24..4db2762e86a 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -159,6 +159,7 @@ The absolute date is the number of days elapsed since the
159 (1- (calendar-absolute-from-french (list month 1 year)))))) 159 (1- (calendar-absolute-from-french (list month 1 year))))))
160 (list month day year)))) 160 (list month day year))))
161 161
162;;;###autoload
162(defun calendar-french-date-string (&optional date) 163(defun calendar-french-date-string (&optional date)
163 "String of French Revolutionary date of Gregorian DATE. 164 "String of French Revolutionary date of Gregorian DATE.
164Returns the empty string if DATE is pre-French Revolutionary. 165Returns the empty string if DATE is pre-French Revolutionary.
@@ -184,6 +185,7 @@ Defaults to today's date if DATE is not given."
184 (aref (french-calendar-month-name-array) (1- m)) 185 (aref (french-calendar-month-name-array) (1- m))
185 y))))) 186 y)))))
186 187
188;;;###autoload
187(defun calendar-print-french-date () 189(defun calendar-print-french-date ()
188 "Show the French Revolutionary calendar equivalent of the selected date." 190 "Show the French Revolutionary calendar equivalent of the selected date."
189 (interactive) 191 (interactive)
@@ -192,6 +194,7 @@ Defaults to today's date if DATE is not given."
192 (message "Date is pre-French Revolution") 194 (message "Date is pre-French Revolution")
193 (message "French Revolutionary date: %s" f)))) 195 (message "French Revolutionary date: %s" f))))
194 196
197;;;###autoload
195(defun calendar-goto-french-date (date &optional noecho) 198(defun calendar-goto-french-date (date &optional noecho)
196 "Move cursor to French Revolutionary date DATE. 199 "Move cursor to French Revolutionary date DATE.
197Echo French Revolutionary date unless NOECHO is t." 200Echo French Revolutionary date unless NOECHO is t."
@@ -205,7 +208,7 @@ Echo French Revolutionary date unless NOECHO is t."
205 (if accents 208 (if accents
206 "Année de la Révolution (>0): " 209 "Année de la Révolution (>0): "
207 "Anne'e de la Re'volution (>0): ") 210 "Anne'e de la Re'volution (>0): ")
208 '(lambda (x) (> x 0)) 211 (lambda (x) (> x 0))
209 (int-to-string 212 (int-to-string
210 (extract-calendar-year 213 (extract-calendar-year
211 (calendar-french-from-absolute 214 (calendar-french-from-absolute
@@ -216,13 +219,13 @@ Echo French Revolutionary date unless NOECHO is t."
216 (append months 219 (append months
217 (if (french-calendar-leap-year-p year) 220 (if (french-calendar-leap-year-p year)
218 (mapcar 221 (mapcar
219 '(lambda (x) (concat "Jour " x)) 222 (lambda (x) (concat "Jour " x))
220 french-calendar-special-days-array) 223 french-calendar-special-days-array)
221 (reverse 224 (reverse
222 (cdr;; we don't want rev. day in a non-leap yr. 225 (cdr;; we don't want rev. day in a non-leap yr.
223 (reverse 226 (reverse
224 (mapcar 227 (mapcar
225 '(lambda (x) 228 (lambda (x)
226 (concat "Jour " x)) 229 (concat "Jour " x))
227 special-days)))))))) 230 special-days))))))))
228 (completion-ignore-case t) 231 (completion-ignore-case t)
@@ -236,7 +239,7 @@ Echo French Revolutionary date unless NOECHO is t."
236 (- month 12) 239 (- month 12)
237 (calendar-read 240 (calendar-read
238 "Jour (1-30): " 241 "Jour (1-30): "
239 '(lambda (x) (and (<= 1 x) (<= x 30)))))) 242 (lambda (x) (and (<= 1 x) (<= x 30))))))
240 (month (if (> month 12) 13 month))) 243 (month (if (> month 12) 13 month)))
241 (list (list month day year))))) 244 (list (list month day year)))))
242 (calendar-goto-date (calendar-gregorian-from-absolute 245 (calendar-goto-date (calendar-gregorian-from-absolute
@@ -252,5 +255,9 @@ Echo French Revolutionary date unless NOECHO is t."
252 255
253(provide 'cal-french) 256(provide 'cal-french)
254 257
255;;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9 258;; Local Variables:
259;; generated-autoload-file: "cal-loaddefs.el"
260;; End:
261
262;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
256;;; cal-french.el ends here 263;;; cal-french.el ends here