(solar-setup): Revert previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc908f5ec4e343ef752913ede7fdeb5ffcba6306..88aec46844e0d0c504d7e75f366f9478f5d17be9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -100,9 +100,6 @@
 
 2005-05-06  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-       * calendar/solar.el (solar-setup): Throw error if called
-       non-interactively.
-
        * calendar/appt.el (top-level): No longer activate on load.
 
 2005-05-06  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index f8e747a317c02fa749babca9cc687367757fc9d3..5eca356af5901335e63bb6950f17841474bf9c8e 100644 (file)
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -208,11 +208,6 @@ Needed for polar areas, in order to know whether the day lasts 0 or 24 hours.")
 
 (defun solar-setup ()
   "Prompt user for latitude, longitude, and time zone."
-  (unless (or (and calendar-longitude calendar-latitude calendar-time-zone)
-              (interactive-p))
-    ;; Defaults must be nil, else results could be subtlely wrong for
-    ;; user's real location.
-    (error "Calendar latitude, longitude and/or time-zone unset"))
   (beep)
   (if (not calendar-longitude)
       (setq calendar-longitude