# HG changeset patch
# User Edward M. Reingold <reingold@emr.cs.iit.edu>
# Date 784226357 0
# Node ID 0cef7b5644f53ee5b0ac21ff5effd5fe87cb3e06
# Parent  e78a12b9ef41cbdfe61699c0eca23de21205de1d
Check for nil time before trying to adjust it for dst.

diff -r e78a12b9ef41 -r 0cef7b5644f5 lisp/calendar/solar.el
--- a/lisp/calendar/solar.el	Mon Nov 07 12:13:16 1994 +0000
+++ b/lisp/calendar/solar.el	Mon Nov 07 16:39:17 1994 +0000
@@ -382,9 +382,9 @@
 (defun solar-sunrise-sunset (date)
   "String giving local times of sunrise and sunset on Gregorian DATE."
   (let* ((rise (solar-sunrise date))
-         (adj-rise (solar-adj-time-for-dst date rise))
+         (adj-rise (if rise (solar-adj-time-for-dst date rise)))
          (set (solar-sunset date))
-         (adj-set (solar-adj-time-for-dst date set)))
+         (adj-set (if set (solar-adj-time-for-dst date set))))
     (format "%s, %s at %s"
 	    (if (and rise (calendar-date-equal date (car adj-rise)))
 		(concat "Sunrise " (apply 'solar-time-string (cdr adj-rise)))