aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-06-18 02:55:32 +0000
committerGlenn Morris2008-06-18 02:55:32 +0000
commitf1eb28f2ab4cb04e140708c7b0c604cecf68309a (patch)
treed1810224fcf2584bf832f1eaf242ed2d05097c3e
parented6c5737840b6fd4ff7b87706e7f3b37b00e9e5d (diff)
downloademacs-f1eb28f2ab4cb04e140708c7b0c604cecf68309a.tar.gz
emacs-f1eb28f2ab4cb04e140708c7b0c604cecf68309a.zip
(calendar-cursor-holidays): Accept optional date.
-rw-r--r--lisp/calendar/holidays.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index fad1475aaac..5ddc587dcc6 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -625,12 +625,14 @@ The holidays are those in the list `calendar-holidays'."
625 'check-calendar-holidays 'calendar-check-holidays "23.1") 625 'check-calendar-holidays 'calendar-check-holidays "23.1")
626 626
627;;;###cal-autoload 627;;;###cal-autoload
628(defun calendar-cursor-holidays () 628(defun calendar-cursor-holidays (&optional date)
629 "Find holidays for the date specified by the cursor in the calendar window." 629 "Find holidays for the date specified by the cursor in the calendar window.
630Optional DATE is a list (month day year) to use instead of the
631cursor position."
630 (interactive) 632 (interactive)
631 (message "Checking holidays...") 633 (message "Checking holidays...")
632 (let* ((date (calendar-cursor-to-date t)) 634 (or date (setq date (calendar-cursor-to-date t)))
633 (date-string (calendar-date-string date)) 635 (let* ((date-string (calendar-date-string date))
634 (holiday-list (calendar-check-holidays date)) 636 (holiday-list (calendar-check-holidays date))
635 (holiday-string (mapconcat 'identity holiday-list "; ")) 637 (holiday-string (mapconcat 'identity holiday-list "; "))
636 (msg (format "%s: %s" date-string holiday-string))) 638 (msg (format "%s: %s" date-string holiday-string)))