summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-dst.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-04-18 21:11:01 -0700
committerGlenn Morris <rgm@gnu.org>2011-04-18 21:11:01 -0700
commitbc4f7f3d586a8d32718e27e99226d1b5ab091db5 (patch)
tree7d3239f45a1385b3686c74fbccce23f5509a71c1 /lisp/calendar/cal-dst.el
parent16a43933e891bae502efbe367e32608fcfffdec3 (diff)
downloademacs-bc4f7f3d586a8d32718e27e99226d1b5ab091db5.tar.gz
calendar housekeeping prompted by lexical-binding.
* lisp/calendar/appt.el (appt-make-list): * lisp/calendar/cal-china.el (calendar-chinese-date-string): * lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits) (diary-hebrew-yahrzeit): * lisp/calendar/cal-tex.el (cal-tex-last-blank-p, cal-tex-cursor-week2): * lisp/calendar/calendar.el (calendar-generate-window): * lisp/calendar/time-date.el (time-to-days): Remove unused local variables. * lisp/calendar/cal-dst.el (dst-adjust-time): Remove never-implemented optional argument `style'. * lisp/calendar/cal-tex.el (cal-tex-list-holidays, cal-tex-cursor-month) (cal-tex-cursor-week, cal-tex-cursor-week2, cal-tex-cursor-week-iso) (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week) (cal-tex-cursor-filofax-daily, cal-tex-mini-calendar) * lisp/calendar/cal-html.el (cal-html-insert-minical): * lisp/calendar/diary-lib.el (diary-list-entries-1, diary-list-entries) (calendar-mark-date-pattern): Prefix "unused" locals.
Diffstat (limited to 'lisp/calendar/cal-dst.el')
-rw-r--r--lisp/calendar/cal-dst.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index e915f7e2696..ffb367a70f6 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -445,16 +445,12 @@ Fractional part of DATE is local standard time of day."
(or (<= dst-starts date) (< date dst-ends))))))
;; used by calc, lunar, solar.
-(defun dst-adjust-time (date time &optional style)
+(defun dst-adjust-time (date time)
"Adjust, to account for dst on DATE, decimal fraction standard TIME.
Returns a list (date adj-time zone) where `date' and `adj-time' are the values
adjusted for `zone'; here `date' is a list (month day year), `adj-time' is a
decimal fraction time, and `zone' is a string.
-Optional parameter STYLE forces the result time to be standard time when its
-value is 'standard and daylight saving time (if available) when its value is
-'daylight.
-
Conversion to daylight saving time is done according to
`calendar-daylight-savings-starts', `calendar-daylight-savings-ends',
`calendar-daylight-savings-starts-time',