Commit c3a3ebc9 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(calendar-goto-french-date): Fix special day

choice in non-leap years by re-reversing the list.  Fix out of
place parenthesis in prompt.
parent 4314dea4
...@@ -168,11 +168,12 @@ Echo French Revolutionary date unless NOECHO is t." ...@@ -168,11 +168,12 @@ Echo French Revolutionary date unless NOECHO is t."
(mapcar (mapcar
'(lambda (x) (concat "Jour " x)) '(lambda (x) (concat "Jour " x))
french-calendar-special-days-array) french-calendar-special-days-array)
(nreverse
(cdr;; we don't want rev. day in a non-leap yr. (cdr;; we don't want rev. day in a non-leap yr.
(nreverse (nreverse
(mapcar (mapcar
'(lambda (x) (concat "Jour " x)) '(lambda (x) (concat "Jour " x))
french-calendar-special-days-array))))))) french-calendar-special-days-array))))))))
(completion-ignore-case t) (completion-ignore-case t)
(month (cdr (assoc (month (cdr (assoc
(capitalize (capitalize
...@@ -192,7 +193,7 @@ Echo French Revolutionary date unless NOECHO is t." ...@@ -192,7 +193,7 @@ Echo French Revolutionary date unless NOECHO is t."
(day (if (> month 12) (day (if (> month 12)
(- month 12) (- month 12)
(calendar-read (calendar-read
"Jour (1-10)): " "Jour (1-10): "
'(lambda (x) (and (<= 1 x) (<= x 10)))))) '(lambda (x) (and (<= 1 x) (<= x 10))))))
(month (if (> month 12) 13 month)) (month (if (> month 12) 13 month))
(day (+ day (* 10 (1- decade))))) (day (+ day (* 10 (1- decade)))))
......
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