felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix YomHashoah date and bug in DoSatReminder.

Browse Source
This commit is contained in:
David F. Skoll
2010-04-21 09:49:33 -04:00
parent d05d85b243
commit 0e827a457d
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/defs.rem
View File

@@ -508,7 +508,13 @@ IF !InIsrael && !Reform
[_h(22, "Nisan")] MSG %"Pesach 8%"
ENDIF
[_PastSun(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
REM [_PastSun(27, "Nisan")] SATISFY 1
IF $Tw == 5
REM [_PastSun(26, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
ELSE
REM [_PastSun(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
ENDIF
# If 4 Iyar is a Friday, then Yom Hazikaron is
# the Wednesday before and Yom Ha'atzmaut is on

5
src/calendar.c
View File

@@ -770,7 +770,10 @@ static int DoCalRem(ParsePtr p, int col)
if (trig.typ == NO_TYPE) return E_EOLN;
if (trig.typ == SAT_TYPE) {
r=DoSatRemind(&trig, &tim, p);
if (r) return r;
if (r) {
if (r == E_EXPIRED) return OK;
return r;
}
if (!LastTrigValid) return OK;
r=ParseToken(p, &buf);
if (r) return r;

7
src/dorem.c
View File

@@ -66,7 +66,10 @@ int DoRem(ParsePtr p)
PurgeEchoLine("%s\n", "#!P: Cannot purge SATISFY-type reminders");
PurgeEchoLine("%s\n", CurLine);
r=DoSatRemind(&trig, &tim, p);
if (r) return r;
if (r) {
if (r == E_EXPIRED) return OK;
return r;
}
if (!LastTrigValid) return OK;
r=ParseToken(p, &buf);
if (r) return r;
@@ -962,7 +965,7 @@ int DoSatRemind(Trigger *trig, TimeTrig *tim, ParsePtr p)
if (r == E_CANT_TRIG) return OK; else return r;
}
if (jul == -1) {
return OK;
return E_EXPIRED;
}
s = p->pos;
r = EvaluateExpr(p, &v);