[Emacs-diffs] Changes to emacs/lisp/calendar/cal-french.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/01 02:40:37

Index: cal-french.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-french.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- cal-french.el       15 Mar 2008 02:57:58 -0000      1.44
+++ cal-french.el       1 Apr 2008 02:40:36 -0000       1.45
@@ -27,15 +27,7 @@
 
 ;;; Commentary:
 
-;; This collection of functions implements the features of calendar.el and
-;; diary.el that deal with the French Revolutionary calendar.
-
-;; Technical details of the French Revolutionary calendar can be found in
-;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold
-;; and Nachum Dershowitz, Cambridge University Press (2001), and in
-;; ``Calendrical Calculations, Part II: Three Historical Calendars'' by
-;; E. M. Reingold, N. Dershowitz, and S. M. Clamen, Software--Practice and
-;; Experience, Volume 23, Number 4 (April, 1993), pages 383-404.
+;; See calendar.el.
 
 ;;; Code:
 
@@ -207,13 +199,11 @@
   "Move cursor to French Revolutionary date DATE.
 Echo French Revolutionary date unless NOECHO is non-nil."
   (interactive
-   (let ((accents (french-calendar-accents))
-         (months (french-calendar-month-name-array))
-         (special-days (french-calendar-special-days-array)))
-     (let* ((year
-             (progn
+   (let* ((months (french-calendar-month-name-array))
+          (special-days (french-calendar-special-days-array))
+          (year (progn
                (calendar-read
-                (if accents
+                   (if (french-calendar-accents)
                     "Année de la Révolution (>0): "
                   "Anne'e de la Re'volution (>0): ")
                 (lambda (x) (> x 0))
@@ -249,7 +239,7 @@
                     "Jour (1-30): "
                     (lambda (x) (and (<= 1 x) (<= x 30))))))
             (month (if (> month 12) 13 month)))
-       (list (list month day year)))))
+     (list (list month day year))))
   (calendar-goto-date (calendar-gregorian-from-absolute
                        (calendar-absolute-from-french date)))
   (or noecho (calendar-print-french-date)))