HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files
[bpt/emacs.git]
/
lisp
/
calendar
/
cal-dst.el
diff --git
a/lisp/calendar/cal-dst.el
b/lisp/calendar/cal-dst.el
index
78ae624
..
e3996ca
100644
(file)
--- a/
lisp/calendar/cal-dst.el
+++ b/
lisp/calendar/cal-dst.el
@@
-1,13
+1,13
@@
;;; cal-dst.el --- calendar functions for daylight saving rules
;;; cal-dst.el --- calendar functions for daylight saving rules
-;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1996, 2001-2012 Free Software Foundation, Inc.
;; Author: Paul Eggert <eggert@twinsun.com>
;; Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: daylight saving time, calendar, diary, holidays
;; Author: Paul Eggert <eggert@twinsun.com>
;; Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
;; Keywords: calendar
;; Human-Keywords: daylight saving time, calendar, diary, holidays
+;; Package: calendar
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-212,12
+212,12
@@
The result has the proper form for `calendar-daylight-savings-starts'."
rlist)
;; 01-01 and 07-01 for this year's Persian calendar.
;; FIXME what does the Persian calendar have to do with this?
rlist)
;; 01-01 and 07-01 for this year's Persian calendar.
;; FIXME what does the Persian calendar have to do with this?
- (
if (and (= m 3) (<= 20 d) (<= d
21))
- '((calendar-gregorian-from-absolute
- (calendar-persian-to-absolute `(1 1 ,(- year 621))))))
- (
if (and (= m 9) (<= 22 d) (<= d
23))
- '((calendar-gregorian-from-absolute
- (calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
+ (
and (= m 3) (memq d '(20
21))
+
'((calendar-gregorian-from-absolute
+
(calendar-persian-to-absolute `(1 1 ,(- year 621))))))
+ (
and (= m 9) (memq d '(22
23))
+
'((calendar-gregorian-from-absolute
+
(calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
(prevday-sec (- -1 utc-diff)) ; last sec of previous local day
(year (1+ y))
new-rules)
(prevday-sec (- -1 utc-diff)) ; last sec of previous local day
(year (1+ y))
new-rules)
@@
-229,7
+229,7
@@
The result has the proper form for `calendar-daylight-savings-starts'."
(setq date (cond ((eq (car rule) 'calendar-nth-named-day)
(eval (cons 'calendar-nth-named-absday (cdr rule))))
((eq (car rule) 'calendar-gregorian-from-absolute)
(setq date (cond ((eq (car rule) 'calendar-nth-named-day)
(eval (cons 'calendar-nth-named-absday (cdr rule))))
((eq (car rule) 'calendar-gregorian-from-absolute)
- (eval (cdr rule)))
+ (eval (c
a
dr rule)))
(t (calendar-absolute-from-gregorian (eval rule)))))
(or (equal (current-time-zone
(calendar-time-from-absolute date prevday-sec))
(t (calendar-absolute-from-gregorian (eval rule)))))
(or (equal (current-time-zone
(calendar-time-from-absolute date prevday-sec))
@@
-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.
(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.
"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',
Conversion to daylight saving time is done according to
`calendar-daylight-savings-starts', `calendar-daylight-savings-ends',
`calendar-daylight-savings-starts-time',
@@
-473,5
+469,4
@@
Conversion to daylight saving time is done according to
(provide 'cal-dst)
(provide 'cal-dst)
-;; arch-tag: a141d204-213c-4ca5-bdc6-f9df3aa92aad
;;; cal-dst.el ends here
;;; cal-dst.el ends here