* solar.el (solar-sunrise, solar-sunset, solar-longitude-of-sun):

Make both arguments to solar-mod float.

(sunrise-sunset): Change screen-width to frame-width.

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 5acef8aa75999efeec5dc1efd6813a6d4b6f443d..e0e51334a2e130f02fb72a22481897b16ebb8167 100644 (file)
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -188,7 +188,7 @@ Returns nil if nothing was entered."
            (* 1.916 (solar-sin-degrees mean-anomaly))
            (* 0.020 (solar-sin-degrees (* 2 mean-anomaly)))
            282.634)
-        360)))
+        360.0)))
 
 (defun solar-right-ascension (longitude)
   "Right ascension of the sun, given its LONGITUDE."
@@ -231,7 +231,7 @@ of hours.  Returns nil if the sun does not rise at that location on that day."
              (mod (- (+ local-sunrise solar-right-ascension-at-sunrise)
                      (+ (* 0.065710 approx-sunrise)
                         6.622))
-                  24)))
+                  24.0)))
        (+ (- local-mean-sunrise (solar-degrees-to-hours calendar-longitude))
           (/ calendar-time-zone 60.0))))))
 
@@ -262,7 +262,7 @@ of hours.  Returns nil if the sun does not set at that location on that day."
              (local-mean-sunset
              (mod (- (+ local-sunset solar-right-ascension-at-sunset)
                      (+ (* 0.065710 approx-sunset) 6.622))
-                  24)))
+                  24.0)))
        (+ (- local-mean-sunset (solar-degrees-to-hours calendar-longitude))
           (/ calendar-time-zone 60.0))))))
 
@@ -430,7 +430,7 @@ This function is suitable for execution in a .emacs file."
         (time-string (solar-sunrise-sunset date))
         (msg (format "%s: %s" date-string time-string))
         (one-window (one-window-p t)))
-   (if (<= (length msg) (screen-width))
+   (if (<= (length msg) (frame-width))
        (message msg)
      (with-output-to-temp-buffer "*temp*"
        (princ (concat date-string "\n" time-string)))