felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-05-03 06:17:09 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make "-tn" explicitly set a delta of ++n for *all* REM statements.

Browse Source 
Also change the name of $DeltaOffset to $DeltaOverride.
This commit is contained in:
Dianne Skoll
2023-06-03 13:36:58 -04:00
parent 65561e7f34
commit e63d4be4e8
9 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dorem.c
+15 -9
View File
@@ -1200,19 +1200,28 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
/* If "infinite delta" option is chosen, always trigger future reminders */
if (InfiniteDelta || NextMode) return 1;
/* If there's a "warn" function, it overrides any deltas */
/* If there's a "warn" function, it overrides any deltas except
* DeltaOverride*/
if (t->warn[0] != 0) {
if (DeltaOffset > 0) {
if (dse <= DSEToday + DeltaOffset) {
if (DeltaOverride > 0) {
if (dse <= DSEToday + DeltaOverride) {
return 1;
}
}
return ShouldTriggerBasedOnWarn(t, dse, err);
}
/* Zero delta */
if (DeltaOverride < 0) {
return dse == DSEToday;
}
/* Move back by delta days, if any */
if (t->delta != NO_DELTA && DeltaOffset >= 0) {
if (t->delta < 0)
if (DeltaOverride) {
/* A positive DeltaOverride takes precedence over everything */
dse = dse - DeltaOverride;
} else if (t->delta != NO_DELTA) {
if (t->delta < 0)
dse = dse + t->delta;
else {
int iter = 0;
@@ -1236,11 +1245,8 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
}
}
if (DeltaOffset < 0) {
return dse == DSEToday;
}
/* Should we trigger the reminder? */
return (dse <= DSEToday + DeltaOffset);
return (dse <= DSEToday);
}
/***************************************************************/