aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-09-14 04:31:22 +0000
committerGlenn Morris2007-09-14 04:31:22 +0000
commit0d7f185bf650e4e1be637468bb2f47591ddf9550 (patch)
tree8251298eb5a886e483a97cff72866c82f9d7ada0
parentcb9b987475d22605081f0948621f1d9599480f46 (diff)
downloademacs-0d7f185bf650e4e1be637468bb2f47591ddf9550.tar.gz
emacs-0d7f185bf650e4e1be637468bb2f47591ddf9550.zip
Rename all check-calendar-holidays callers to calendar-check-holidays.
-rw-r--r--lisp/calendar/diary-lib.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 09034ab3a8d..55cd8bc0a0a 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -75,7 +75,7 @@ D-FILE specifies the file to use as the diary file."
75 (let ((diary-file d-file)) 75 (let ((diary-file d-file))
76 (diary-view-entries arg))) 76 (diary-view-entries arg)))
77 77
78(autoload 'check-calendar-holidays "holidays" 78(autoload 'calendar-check-holidays "holidays"
79 "Check the list of holidays for any that occur on DATE. 79 "Check the list of holidays for any that occur on DATE.
80The value returned is a list of strings of relevant holiday descriptions. 80The value returned is a list of strings of relevant holiday descriptions.
81The holidays are those in the list `calendar-holidays'.") 81The holidays are those in the list `calendar-holidays'.")
@@ -598,7 +598,7 @@ changing the variable `diary-include-string'."
598(defun simple-diary-display () 598(defun simple-diary-display ()
599 "Display the diary buffer if there are any relevant entries or holidays." 599 "Display the diary buffer if there are any relevant entries or holidays."
600 (let* ((holiday-list (if holidays-in-diary-buffer 600 (let* ((holiday-list (if holidays-in-diary-buffer
601 (check-calendar-holidays original-date))) 601 (calendar-check-holidays original-date)))
602 (hol-string (format "%s%s%s" 602 (hol-string (format "%s%s%s"
603 date-string 603 date-string
604 (if holiday-list ": " "") 604 (if holiday-list ": " "")
@@ -676,7 +676,7 @@ This function is provided for optional use as the `diary-display-hook'."
676 (and (not (cdr diary-entries-list)) 676 (and (not (cdr diary-entries-list))
677 (string-equal (car (cdr (car diary-entries-list))) ""))) 677 (string-equal (car (cdr (car diary-entries-list))) "")))
678 (let* ((holiday-list (if holidays-in-diary-buffer 678 (let* ((holiday-list (if holidays-in-diary-buffer
679 (check-calendar-holidays original-date))) 679 (calendar-check-holidays original-date)))
680 (msg (format "No diary entries for %s %s" 680 (msg (format "No diary entries for %s %s"
681 (concat date-string (if holiday-list ":" "")) 681 (concat date-string (if holiday-list ":" ""))
682 (mapconcat 'identity holiday-list "; ")))) 682 (mapconcat 'identity holiday-list "; "))))