mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 10:50:49 -08:00
Code Issues Projects Releases Wiki Activity

(list-holidays): Use or.

Browse source
This commit is contained in:
Glenn Morris 2008-03-29 23:26:17 +00:00
parent d53e3af1d4
commit b54eb5847e
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -3,6 +3,8 @@
* calendar/cal-hebrew.el (holiday-hebrew): Simplify. * calendar/cal-hebrew.el (holiday-hebrew): Simplify.
* calendar/cal-julian.el (holiday-julian): Simplify. * calendar/cal-julian.el (holiday-julian): Simplify.
* calendar/holidays.el (list-holidays): Use or.
2008-03-29 Juri Linkov <juri@jurta.org> 2008-03-29 Juri Linkov <juri@jurta.org>
* window.el (split-window-preferred-horizontally): New function. * window.el (split-window-preferred-horizontally): New function.

2
lisp/calendar/holidays.el
View file

@ -186,7 +186,7 @@ The optional LABEL is used to label the buffer created."
(list start-year end-year which name))) (list start-year end-year which name)))
(unless y2 (setq y2 y1)) (unless y2 (setq y2 y1))
(message "Computing holidays...") (message "Computing holidays...")
(let* ((calendar-holidays (if l l calendar-holidays)) (let* ((calendar-holidays (or l calendar-holidays))
(title (or label "Holidays")) (title (or label "Holidays"))
(holiday-list nil) (holiday-list nil)
(s (calendar-absolute-from-gregorian (list 2 1 y1))) (s (calendar-absolute-from-gregorian (list 2 1 y1)))