(list-holidays): Use or.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9ed1bd869c2d5ee784ab55e72e97dd922b94225..a819697a449146b443b1d0cc5be6867672ca4485 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
        * calendar/cal-hebrew.el (holiday-hebrew): Simplify.
        * calendar/cal-julian.el (holiday-julian): Simplify.
 
+       * calendar/holidays.el (list-holidays): Use or.
+
 2008-03-29  Juri Linkov  <juri@jurta.org>
 
        * window.el (split-window-preferred-horizontally): New function.

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 833c8b65245f17fc2bd43e8523379d6dd5d26b76..28cde37e40098b16e5b9e6126b762a61fb4f9179 100644 (file)
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -186,7 +186,7 @@ The optional LABEL is used to label the buffer created."
      (list start-year end-year which name)))
   (unless y2 (setq y2 y1))
   (message "Computing holidays...")
-  (let* ((calendar-holidays (if l l calendar-holidays))
+  (let* ((calendar-holidays (or l calendar-holidays))
          (title (or label "Holidays"))
          (holiday-list nil)
          (s (calendar-absolute-from-gregorian (list 2 1 y1)))