From 602419bbca9ae92e10c634b13bec6df3622d2714 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 27 Aug 2021 03:10:46 +0200 Subject: [PATCH] Enable setting timeclock-workday after switching mode on * lisp/calendar/timeclock.el (timeclock--previous-workday): New variable. (timeclock-find-discrep): Use it to flush values when timeclock-workday changes (bug#50216). (timeclock-mode-line-display): Mention `timeclock-workday' setting in doc string. --- lisp/calendar/timeclock.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 1aea1b5e63c..0b94bcb77fe 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -88,6 +88,8 @@ "The length of a work period in seconds." :type 'integer) +(defvar timeclock--previous-workday nil) + (defcustom timeclock-relative t "Whether to make reported time relative to `timeclock-workday'. For example, if the length of a normal workday is eight hours, and you @@ -269,7 +271,10 @@ will be updated whenever the time display is updated. Otherwise, the timeclock will use its own sixty second timer to do its updating. With prefix ARG, turn mode line display on if and only if ARG is positive. Returns the new status of timeclock mode line -display (non-nil means on)." +display (non-nil means on). + +If using a customized `timeclock-workday' value, this should be +set before switching this mode on." :global t ;; cf display-time-mode. (setq timeclock-mode-string "") @@ -1058,7 +1063,9 @@ discrepancy, today's discrepancy, and the time worked today." (first t) (accum 0) (elapsed 0) event beg last-date last-date-limited last-date-seconds) - (unless timeclock-discrepancy + (when (or (not timeclock-discrepancy) + ;; The length of the workday has changed, so recompute. + (not (equal timeclock-workday timeclock--previous-workday))) (when (file-readable-p timeclock-file) (setq timeclock-project-list nil timeclock-last-project nil @@ -1114,7 +1121,8 @@ discrepancy, today's discrepancy, and the time worked today." last-date-seconds timeclock-workday)) (forward-line)) - (setq timeclock-discrepancy accum)))) + (setq timeclock-discrepancy accum + timeclock--previous-workday timeclock-workday)))) (unless timeclock-last-event-workday (setq timeclock-last-event-workday timeclock-workday)) (setq accum (or timeclock-discrepancy 0) -- 2.39.2