Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0d7f185b
Commit
0d7f185b
authored
Sep 14, 2007
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename all check-calendar-holidays callers to calendar-check-holidays.
parent
cb9b9874
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+3
-3
No files found.
lisp/calendar/diary-lib.el
View file @
0d7f185b
...
...
@@ -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
"; "
))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment