# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1206833165 0
# Node ID 5f88d76e42f06b4bce354a0342a3d32eccbc9553
# Parent  2e939b95b436ce40d4af3730b9fcd8423def092b
(list-holidays): Use or.

diff -r 2e939b95b436 -r 5f88d76e42f0 lisp/calendar/holidays.el
--- a/lisp/calendar/holidays.el	Sat Mar 29 23:24:35 2008 +0000
+++ b/lisp/calendar/holidays.el	Sat Mar 29 23:26:05 2008 +0000
@@ -186,7 +186,7 @@
      (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)))