From: Glenn Morris <rgm@gnu.org>
Date: Sat, 29 Mar 2008 23:26:17 +0000 (+0000)
Subject: (list-holidays): Use or.
X-Git-Tag: emacs-pretest-23.0.90~6776
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b54eb5847e204a1f7a3014cbbbdaa9687a0cc984;p=emacs.git

(list-holidays): Use or.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9ed1bd869c..a819697a449 100644
--- 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 833c8b65245..28cde37e400 100644
--- 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)))