Re: [O] [PATCH] Fix incorrect time calculation for org-extend-today-until
Hi Ian, I must have missed this a month ago, sorry about this. I applied the patch now (by hand, git-am choked on it.) Thank you! - Carsten On 16.10.2013, at 20:58, Ian Kelling wrote: > I sent this patch a month ago, but it got no reply. Perhaps that I > accidentally had html email format didn't help. > > During the extra hours of org-extend-today-until, when > org-clock-mode-line-total is 'today, the clocked time shown in the > modeline is wrong. It ignores all previously clocked time, when it > should add them starting from the past day beyond > org-extend-today-until hours. This also affects clock tables. > > The problem can be reproduced in emacs -q with the following code, > as long as the current time is not between 11 PM and 12 AM: > > (progn >(require 'org-clock) >(setq org-clock-mode-line-total 'today) >(setq org-extend-today-until 23) >(format-time-string "%a %D %l:%M %p" (org-clock-get-sum-start))) > > expected result: > A date of yesterday, time of 11:00 PM > > Actual result: > A date of today, time of 11:00 PM > > Note this patch only fixes a bug where org-extend-today-until > is already used. > > > - Ian Kelling > > <0001-Fix-incorrect-time-calculation-for-org-extend-today-.patch> signature.asc Description: Message signed with OpenPGP using GPGMail
[O] [PATCH] Fix incorrect time calculation for org-extend-today-until
I sent this patch a month ago, but it got no reply. Perhaps that I accidentally had html email format didn't help. During the extra hours of org-extend-today-until, when org-clock-mode-line-total is 'today, the clocked time shown in the modeline is wrong. It ignores all previously clocked time, when it should add them starting from the past day beyond org-extend-today-until hours. This also affects clock tables. The problem can be reproduced in emacs -q with the following code, as long as the current time is not between 11 PM and 12 AM: (progn (require 'org-clock) (setq org-clock-mode-line-total 'today) (setq org-extend-today-until 23) (format-time-string "%a %D %l:%M %p" (org-clock-get-sum-start))) expected result: A date of yesterday, time of 11:00 PM Actual result: A date of today, time of 11:00 PM Note this patch only fixes a bug where org-extend-today-until is already used. - Ian Kelling >From 0c23ccb9b00fd42f830f5a7472e2980b93c6040f Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 15 Sep 2013 08:03:24 -0700 Subject: [PATCH] Fix incorrect time calculation for `org-extend-today-until' * lisp/org-clock.el (org-clock-get-sum-start): Fix bad date math, affecting mode line and clock tables. TINYCHANGE --- lisp/org-clock.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 9f22562..3195dc1 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1368,10 +1368,12 @@ decides which time to use." (current-time)) ((equal cmt "today") (setq msg-extra "showing today's task time.") - (let* ((dt (decode-time (current-time - (setq dt (append (list 0 0 0) (nthcdr 3 dt))) - (if org-extend-today-until - (setf (nth 2 dt) org-extend-today-until)) + (let* ((dt (decode-time (current-time))) + (hour (nth 2 dt)) + (day (nth 3 dt))) + (if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day))) + (setf (nth 2 dt) org-extend-today-until) + (setq dt (append (list 0 0) (nthcdr 2 dt))) (apply 'encode-time dt))) ((or (equal cmt "all") (and (or (not cmt) (equal cmt "auto")) -- 1.8.3.1
Re: [O] [PATCH] Fix incorrect time calculation for org-extend-today-until
Updated patch, fixed commit message format. >From 0c23ccb9b00fd42f830f5a7472e2980b93c6040f Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 15 Sep 2013 08:03:24 -0700 Subject: [PATCH] Fix incorrect time calculation for `org-extend-today-until' * lisp/org-clock.el (org-clock-get-sum-start): Fix bad date math, affecting mode line and clock tables. TINYCHANGE --- lisp/org-clock.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 9f22562..3195dc1 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1368,10 +1368,12 @@ decides which time to use." (current-time)) ((equal cmt "today") (setq msg-extra "showing today's task time.") - (let* ((dt (decode-time (current-time - (setq dt (append (list 0 0 0) (nthcdr 3 dt))) - (if org-extend-today-until - (setf (nth 2 dt) org-extend-today-until)) + (let* ((dt (decode-time (current-time))) + (hour (nth 2 dt)) + (day (nth 3 dt))) + (if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day))) + (setf (nth 2 dt) org-extend-today-until) + (setq dt (append (list 0 0) (nthcdr 2 dt))) (apply 'encode-time dt))) ((or (equal cmt "all") (and (or (not cmt) (equal cmt "auto")) -- 1.8.3.1
[O] [PATCH] Fix incorrect time calculation for org-extend-today-until
During the extra hours of org-extend-today-until, when org-clock-mode-line-total is 'today, the clocked time shown in the modeline is wrong. It ignores all previously clocked time, when it should add them starting from the past day beyond org-extend-today-until hours. This also affects clock tables. The problem can be reproduced in emacs with the following code, as long as the current time is not between 11 PM and 12 AM: (progn (require 'org-clock) (setq org-clock-mode-line-total 'today) (setq org-extend-today-until 23) (format-time-string "%a %D %l:%M %p" (org-clock-get-sum-start))) expected result: A date of yesterday, time of 11:00 PM Actual result: A date of today, time of 11:00 PM Note this patch only fixes a bug where org-extend-today-until is already used. - Ian Kelling >From 619572e221cafc17f0a1c33654eb22d7ca5f4d89 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 15 Sep 2013 08:03:24 -0700 Subject: [PATCH] Fix incorrect time calculation for org-extend-today-until * lisp/org-clock.el Fix bad date math. Affects mode line and clock tables. TINYCHANGE --- lisp/org-clock.el | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 9f22562..3195dc1 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1368,10 +1368,12 @@ decides which time to use." (current-time)) ((equal cmt "today") (setq msg-extra "showing today's task time.") - (let* ((dt (decode-time (current-time - (setq dt (append (list 0 0 0) (nthcdr 3 dt))) - (if org-extend-today-until - (setf (nth 2 dt) org-extend-today-until)) + (let* ((dt (decode-time (current-time))) + (hour (nth 2 dt)) + (day (nth 3 dt))) + (if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day))) + (setf (nth 2 dt) org-extend-today-until) + (setq dt (append (list 0 0) (nthcdr 2 dt))) (apply 'encode-time dt))) ((or (equal cmt "all") (and (or (not cmt) (equal cmt "auto")) -- 1.8.3.1
