From 21c8986e277687256fc21fb859d28ed933748902 Mon Sep 17 00:00:00 2001 From: "Edward M. Reingold" Date: Tue, 10 May 1994 21:57:35 +0000 Subject: [PATCH] (calendar-cursor-to-date): Fix error return. (calendar-iso-date-string): Repair punctuation. --- lisp/calendar/calendar.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index a1661e106f4..37069fa0a00 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1983,12 +1983,13 @@ ERROR is t, otherwise just returns nil." (list month (string-to-int (buffer-substring (1+ (point)) (+ 4 (point)))) year)) - (if (and (looking-at "\\*") - (save-excursion - (re-search-backward "[^*]") - (looking-at ".\\*\\*"))) - (list month calendar-starred-day year) - (if error (error "Cursor is not on a date!")))))) + (if (looking-at "\\*") + (save-excursion + (re-search-backward "[^*]") + (if (looking-at ".\\*\\*") + (list month starred-day year) + (if error (error "Not on a date!")))) + (if error (error "Not on a date!")))))) (defun calendar-cursor-to-nearest-date () "Move the cursor to the closest date. @@ -2721,7 +2722,7 @@ Defaults to today's date if DATE is not given." (or date (calendar-current-date)))) (day (% d 7)) (iso-date (calendar-iso-from-absolute d))) - (format "Day %s of week %d of %d." + (format "Day %s of week %d of %d" (if (zerop day) 7 day) (extract-calendar-month iso-date) (extract-calendar-year iso-date)))) -- 2.39.5