diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2007-07-09 16:47:56 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2007-07-09 16:47:56 +0000 |
| commit | 0867f7baa84e27a1294a62a023829f319620ef70 (patch) | |
| tree | 07f00fcef6f531b00cb8ab74f5744bbb6c852c9d /srfi | |
| parent | d3075c52acac924e91b64c6f91759c757ad3b741 (diff) | |
| download | guile-0867f7baa84e27a1294a62a023829f319620ef70.tar.gz | |
Changes from arch/CVS synchronization
Diffstat (limited to 'srfi')
| -rw-r--r-- | srfi/ChangeLog | 5 | ||||
| -rw-r--r-- | srfi/srfi-19.scm | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/srfi/ChangeLog b/srfi/ChangeLog index 2cc0d4d09..0d7c9585b 100644 --- a/srfi/ChangeLog +++ b/srfi/ChangeLog @@ -1,3 +1,8 @@ +2007-07-09 Ludovic Courtès <ludo@gnu.org> + + * srfi-19.scm (date->julian-day): Take OFFSET into account. + Patch by Jon Wilson <j85wilson@fastmail.fm>. + 2007-05-09 Ludovic Courtès <ludo@chbouib.org> * srfi-19.scm (priv:current-time-process): Removed shadowing diff --git a/srfi/srfi-19.scm b/srfi/srfi-19.scm index 5b94b8808..08302d0c8 100644 --- a/srfi/srfi-19.scm +++ b/srfi/srfi-19.scm @@ -811,10 +811,12 @@ (hour (date-hour date)) (day (date-day date)) (month (date-month date)) - (year (date-year date))) + (year (date-year date)) + (offset (date-zone-offset date))) (+ (priv:encode-julian-day-number day month year) (- 1/2) - (+ (/ (+ (* hour 60 60) + (+ (/ (+ (- offset) + (* hour 60 60) (* minute 60) second (/ nanosecond priv:nano)) |