# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 745862129 0
# Node ID 7ca17b5fd85e526dff8d018ded21154ddb1027c6
# Parent  d81041bb1e3ddd25a7a4e8d1772ddcb6a89a6d94
* 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 -r d81041bb1e3d -r 7ca17b5fd85e lisp/calendar/solar.el
--- a/lisp/calendar/solar.el	Thu Aug 19 22:29:35 1993 +0000
+++ b/lisp/calendar/solar.el	Fri Aug 20 15:55:29 1993 +0000
@@ -188,7 +188,7 @@
 	    (* 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 @@
 	      (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 @@
              (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 @@
         (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)))