aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calendar/cal-french.el10
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b2572e56f98..2a2537ebe10 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,6 +1,6 @@
1;;; cal-french.el --- calendar functions for the French Revolutionary calendar. 1;;; cal-french.el --- calendar functions for the French Revolutionary calendar.
2 2
3;; Copyright (C) 1988, 1989, 1992 Free Software Foundation, Inc. 3;; Copyright (C) 1988, 1989, 1992, 1994 Free Software Foundation, Inc.
4 4
5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
6;; Keywords: calendar 6;; Keywords: calendar
@@ -151,9 +151,7 @@ Defaults to today's date if DATE is not given."
151(defun calendar-print-french-date () 151(defun calendar-print-french-date ()
152 "Show the French Revolutionary calendar equivalent of the selected date." 152 "Show the French Revolutionary calendar equivalent of the selected date."
153 (interactive) 153 (interactive)
154 (let ((f (calendar-french-date-string 154 (let ((f (calendar-french-date-string (calendar-cursor-to-date t))))
155 (or (calendar-cursor-to-date)
156 (error "Cursor is not on a date!")))))
157 (if (string-equal f "") 155 (if (string-equal f "")
158 (message "Date is pre-French Revolution") 156 (message "Date is pre-French Revolution")
159 (message f)))) 157 (message f))))
@@ -213,9 +211,7 @@ Echo French Revolutionary date unless NOECHO is t."
213 211
214(defun diary-french-date () 212(defun diary-french-date ()
215 "French calendar equivalent of date diary entry." 213 "French calendar equivalent of date diary entry."
216 (let ((f (calendar-french-date-string 214 (let ((f (calendar-french-date-string (calendar-cursor-to-date t))))
217 (or (calendar-cursor-to-date)
218 (error "Cursor is not on a date!")))))
219 (if (string-equal f "") 215 (if (string-equal f "")
220 "Date is pre-French Revolution" 216 "Date is pre-French Revolution"
221 f))) 217 f)))