[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el

[Glenn Morris]

Index: emacs/lisp/calendar/solar.el
diff -c emacs/lisp/calendar/solar.el:1.51 emacs/lisp/calendar/solar.el:1.52
*** emacs/lisp/calendar/solar.el:1.51   Wed Mar 30 16:55:58 2005
--- emacs/lisp/calendar/solar.el        Fri May  6 20:56:52 2005
***************
*** 4,9 ****
--- 4,10 ----
  
  ;; Author: Edward M. Reingold <address@hidden>
  ;;    Denis B. Roegel <address@hidden>
+ ;; Maintainer: Glenn Morris <address@hidden>
  ;; Keywords: calendar
  ;; Human-Keywords: sunrise, sunset, equinox, solstice, calendar, diary,
  ;;    holidays
***************
*** 207,212 ****
--- 208,218 ----
  
  (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