diff options
| author | Glenn Morris | 2005-05-07 22:43:46 +0000 |
|---|---|---|
| committer | Glenn Morris | 2005-05-07 22:43:46 +0000 |
| commit | d908da33640d936830fba7acb3dad8aae6445361 (patch) | |
| tree | 4cb48c86237781892cc6a76503f0fc5e5648d5d6 | |
| parent | 1d64910fe974b28607b19c0f669fc12dec0cec6a (diff) | |
| download | emacs-d908da33640d936830fba7acb3dad8aae6445361.tar.gz emacs-d908da33640d936830fba7acb3dad8aae6445361.zip | |
(solar-setup): Revert previous change.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/calendar/solar.el | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc908f5ec4e..88aec46844e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -100,9 +100,6 @@ | |||
| 100 | 100 | ||
| 101 | 2005-05-06 Glenn Morris <gmorris@ast.cam.ac.uk> | 101 | 2005-05-06 Glenn Morris <gmorris@ast.cam.ac.uk> |
| 102 | 102 | ||
| 103 | * calendar/solar.el (solar-setup): Throw error if called | ||
| 104 | non-interactively. | ||
| 105 | |||
| 106 | * calendar/appt.el (top-level): No longer activate on load. | 103 | * calendar/appt.el (top-level): No longer activate on load. |
| 107 | 104 | ||
| 108 | 2005-05-06 Juanma Barranquero <lekktu@gmail.com> | 105 | 2005-05-06 Juanma Barranquero <lekktu@gmail.com> |
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index f8e747a317c..5eca356af59 100644 --- 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.") | |||
| 208 | 208 | ||
| 209 | (defun solar-setup () | 209 | (defun solar-setup () |
| 210 | "Prompt user for latitude, longitude, and time zone." | 210 | "Prompt user for latitude, longitude, and time zone." |
| 211 | (unless (or (and calendar-longitude calendar-latitude calendar-time-zone) | ||
| 212 | (interactive-p)) | ||
| 213 | ;; Defaults must be nil, else results could be subtlely wrong for | ||
| 214 | ;; user's real location. | ||
| 215 | (error "Calendar latitude, longitude and/or time-zone unset")) | ||
| 216 | (beep) | 211 | (beep) |
| 217 | (if (not calendar-longitude) | 212 | (if (not calendar-longitude) |
| 218 | (setq calendar-longitude | 213 | (setq calendar-longitude |