diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
| commit | 68ed6bfb6599104e5f1635a862a373735d818722 (patch) | |
| tree | 2488b3f959d3dbff87745fb265cd564445616b2a /lisp/gnus/gnus-icalendar.el | |
| parent | eced64b2f76d1f85fb6fd54c67deadf1978cb344 (diff) | |
| parent | bd58c136d6ef33a24423720b5cf3c4e8c03fd4a9 (diff) | |
| download | emacs-68ed6bfb6599104e5f1635a862a373735d818722.tar.gz | |
Merge from origin/emacs-25
bd58c13 Improve documentation of focus-related hooks
00a4720 Further improve doc string of 'disable-point-adjustment'
c582def Further adaptions in file-notify-tests.el for w32notify
a1585e1 Don't bug out on localised dates in gnus-icalendar
Diffstat (limited to 'lisp/gnus/gnus-icalendar.el')
| -rw-r--r-- | lisp/gnus/gnus-icalendar.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el index 96697b22791..dea6523a541 100644 --- a/lisp/gnus/gnus-icalendar.el +++ b/lisp/gnus/gnus-icalendar.el @@ -412,10 +412,11 @@ Return nil for non-recurring EVENT." (end-date (format-time-string "%Y-%m-%d" end)) (end-time (format-time-string "%H:%M" end)) (end-at-midnight (string= end-time "00:00")) - (start-end-date-diff (/ (float-time (time-subtract - (date-to-time end-date) - (date-to-time start-date))) - 86400)) + (start-end-date-diff + (/ (float-time (time-subtract + (org-time-string-to-time end-date) + (org-time-string-to-time start-date))) + 86400)) (org-repeat (gnus-icalendar-event:org-repeat event)) (repeat (if org-repeat (concat " " org-repeat) "")) (time-1-day '(0 86400))) |