Commit 0d7f185b authored by Glenn Morris's avatar Glenn Morris

Rename all check-calendar-holidays callers to calendar-check-holidays.

parent cb9b9874
......@@ -75,7 +75,7 @@ D-FILE specifies the file to use as the diary file."
(let ((diary-file d-file))
(diary-view-entries arg)))
(autoload 'check-calendar-holidays "holidays"
(autoload 'calendar-check-holidays "holidays"
"Check the list of holidays for any that occur on DATE.
The value returned is a list of strings of relevant holiday descriptions.
The holidays are those in the list `calendar-holidays'.")
......@@ -598,7 +598,7 @@ changing the variable `diary-include-string'."
(defun simple-diary-display ()
"Display the diary buffer if there are any relevant entries or holidays."
(let* ((holiday-list (if holidays-in-diary-buffer
(check-calendar-holidays original-date)))
(calendar-check-holidays original-date)))
(hol-string (format "%s%s%s"
date-string
(if holiday-list ": " "")
......@@ -676,7 +676,7 @@ This function is provided for optional use as the `diary-display-hook'."
(and (not (cdr diary-entries-list))
(string-equal (car (cdr (car diary-entries-list))) "")))
(let* ((holiday-list (if holidays-in-diary-buffer
(check-calendar-holidays original-date)))
(calendar-check-holidays original-date)))
(msg (format "No diary entries for %s %s"
(concat date-string (if holiday-list ":" ""))
(mapconcat 'identity holiday-list "; "))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment