Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a2faecac
Commit
a2faecac
authored
Dec 16, 1998
by
Karl Heuer
Browse files
(diary-float): Fix end-of-year error and typos in comments.
parent
acc81368
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+4
-4
No files found.
lisp/calendar/diary-lib.el
View file @
a2faecac
...
...
@@ -1280,7 +1280,7 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
(
m2
(
extract-calendar-month
last
))
(
d2
(
extract-calendar-day
last
))
(
y2
(
extract-calendar-year
last
)))
(if (or (and (= m1 m2)
; only possible base dates in one month
(
if
(
or
(
and
(
=
m1
m2
)
; only possible base dates in one month
(
or
(
and
(
listp
month
)
(
memq
m1
month
))
(
eq
month
t
)
(
=
m1
month
))
...
...
@@ -1289,9 +1289,9 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
(
calendar-last-day-of-month
m1
y1
)))))
(
and
(
<=
d1
d
)
(
<=
d
d2
))))
;; only possible base dates straddle two months
(and (
<
m1 m2)
(
and
(
/=
m1
m2
)
(
or
;; m1, d1 works
i
s a base date
;; m1, d1 works
a
s a base date
(
and
(
or
(
and
(
listp
month
)
(
memq
m1
month
))
(
eq
month
t
)
...
...
@@ -1299,7 +1299,7 @@ An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY."
(
<=
d1
(
or
day
(
if
(
>
n
0
)
1
(
calendar-last-day-of-month
m1
y1
)))))
;; m2, d2 works
i
s a base date
;; m2, d2 works
a
s a base date
(
and
(
or
(
and
(
listp
month
)
(
memq
m2
month
))
(
eq
month
t
)
(
=
m2
month
))
...
...
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