aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-01-02 19:03:36 +0000
committerRichard M. Stallman1994-01-02 19:03:36 +0000
commitc3a3ebc910aca2f1fb0c6bb5ccf2b6747a1baa1b (patch)
treebcb361ceb009273517a57cd1ae136b63b2892645
parent4314dea4b4e7a9b2f88dac84744ae5145ee07f81 (diff)
downloademacs-c3a3ebc910aca2f1fb0c6bb5ccf2b6747a1baa1b.tar.gz
emacs-c3a3ebc910aca2f1fb0c6bb5ccf2b6747a1baa1b.zip
(calendar-goto-french-date): Fix special day
choice in non-leap years by re-reversing the list. Fix out of place parenthesis in prompt.
-rw-r--r--lisp/calendar/cal-french.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 2f9c92e9345..4a528eb0aa0 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -168,11 +168,12 @@ Echo French Revolutionary date unless NOECHO is t."
168 (mapcar 168 (mapcar
169 '(lambda (x) (concat "Jour " x)) 169 '(lambda (x) (concat "Jour " x))
170 french-calendar-special-days-array) 170 french-calendar-special-days-array)
171 (nreverse
171 (cdr;; we don't want rev. day in a non-leap yr. 172 (cdr;; we don't want rev. day in a non-leap yr.
172 (nreverse 173 (nreverse
173 (mapcar 174 (mapcar
174 '(lambda (x) (concat "Jour " x)) 175 '(lambda (x) (concat "Jour " x))
175 french-calendar-special-days-array))))))) 176 french-calendar-special-days-array))))))))
176 (completion-ignore-case t) 177 (completion-ignore-case t)
177 (month (cdr (assoc 178 (month (cdr (assoc
178 (capitalize 179 (capitalize
@@ -192,7 +193,7 @@ Echo French Revolutionary date unless NOECHO is t."
192 (day (if (> month 12) 193 (day (if (> month 12)
193 (- month 12) 194 (- month 12)
194 (calendar-read 195 (calendar-read
195 "Jour (1-10)): " 196 "Jour (1-10): "
196 '(lambda (x) (and (<= 1 x) (<= x 10)))))) 197 '(lambda (x) (and (<= 1 x) (<= x 10))))))
197 (month (if (> month 12) 13 month)) 198 (month (if (> month 12) 13 month))
198 (day (+ day (* 10 (1- decade))))) 199 (day (+ day (* 10 (1- decade)))))