aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-11-14 22:51:17 +0000
committerRichard M. Stallman1993-11-14 22:51:17 +0000
commit3b92bdd24ed2677a5c2d4ffd531e817031e6509a (patch)
tree0d55844e92087597afdcfcbc6b350a5a59aa2fc1
parent085a9cd86f94f89087eed15d29e126bdfb43a85f (diff)
downloademacs-3b92bdd24ed2677a5c2d4ffd531e817031e6509a.tar.gz
emacs-3b92bdd24ed2677a5c2d4ffd531e817031e6509a.zip
(solar-holidays): Change top-level progn to an if.
-rw-r--r--lisp/calendar/calendar.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index a1b112252e1..0875b83eff3 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -749,10 +749,11 @@ See the documentation for `calendar-holidays' for details.")
749(defvar solar-holidays 749(defvar solar-holidays
750 '((if (fboundp 'atan) 750 '((if (fboundp 'atan)
751 (solar-equinoxes-solstices)) 751 (solar-equinoxes-solstices))
752 (progn 752 (if (progn
753 (require 'cal-dst) 753 (require 'cal-dst)
754 t)
754 (funcall 755 (funcall
755 'holiday-sexp 756 'holiday-sexp
756 calendar-daylight-savings-starts 757 calendar-daylight-savings-starts
757 '(format "Daylight Savings Time Begins %s" 758 '(format "Daylight Savings Time Begins %s"
758 (if (fboundp 'atan) 759 (if (fboundp 'atan)