Mercurial > emacs
changeset 7255:c79c14e28d71
(sunrise-sunset): Undo previous change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 01 May 1994 20:18:39 +0000 |
| parents | ae9c4159e36a |
| children | 0f06f87f3c3b |
| files | lisp/calendar/solar.el |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/solar.el Sun May 01 19:35:40 1994 +0000 +++ b/lisp/calendar/solar.el Sun May 01 20:18:39 1994 +0000 @@ -392,10 +392,10 @@ ;;;###autoload (defun sunrise-sunset (&optional arg) "Local time of sunrise and sunset for today. Accurate to +/- 2 minutes. -If called with an optional prefix argument, prompts for date. +If called with an optional prefix argument, prompt for date. -If called with an optional double prefix argument, prompts for longitude, -latitude, time zone, and date. +If called with an optional double prefix argument, prompt for longitude, +latitude, time zone, and date, and always use standard time. This function is suitable for execution in a .emacs file." (interactive "p") @@ -429,12 +429,10 @@ ((< calendar-time-zone 0) (format "UTC%dmin" calendar-time-zone)) (t (format "UTC+%dmin" calendar-time-zone))))) -;; Use outer context values always, unless you're going to prompt for -;; the values to use. PKH -;; (calendar-daylight-savings-starts -;; (if (< arg 16) calendar-daylight-savings-starts)) -;; (calendar-daylight-savings-ends -;; (if (< arg 16) calendar-daylight-savings-ends)) + (calendar-daylight-savings-starts + (if (< arg 16) calendar-daylight-savings-starts)) + (calendar-daylight-savings-ends + (if (< arg 16) calendar-daylight-savings-ends)) (date (if (< arg 4) (calendar-current-date) (calendar-read-date))) (date-string (calendar-date-string date t)) (time-string (solar-sunrise-sunset date))