From b3a2c0e7c73059bdc3028c847a1181ef7c19afbf Mon Sep 17 00:00:00 2001 From: Dianne Skoll Date: Sun, 28 Sep 2025 22:52:44 -0400 Subject: [PATCH] Don't add a spurious blank line if there are no entries at all for a given calendar row. --- src/calendar.c | 12 ++++++++++++ tests/test.cmp | 22 ---------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/calendar.c b/src/calendar.c index 2fcf02b9..d4a39020 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -1489,6 +1489,18 @@ static int WriteOneCalLine(int start_dse, int wd) int done = 1, i; int d; + /* Do nothing if there are no calendar entries at all */ + d = 0; + for (i=0; i<7; i++) { + if (CalColumn[i]) { + d = 1; + break; + } + } + if (!d) { + /* Nothing to do */ + return 1; + } gon(); DRAW(tb); goff(); diff --git a/tests/test.cmp b/tests/test.cmp index f79d78ee..a75df051 100644 --- a/tests/test.cmp +++ b/tests/test.cmp @@ -19069,7 +19069,6 @@ Color Test (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0tqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqu(B (0x(B5 ‎ (0x(B6 ‎ (0x(B7 ‎ (0x(B8 ‎ (0x(B9 ‎ (0x(B10 ‎ (0x(B11 ‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B @@ -19077,7 +19076,6 @@ Color Test (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0tqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqu(B (0x(B12 ‎ (0x(B13 ‎ (0x(B14 ‎ (0x(B15 ‎ (0x(B16 ‎ (0x(B17 ‎ (0x(B18 ‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B @@ -19085,7 +19083,6 @@ Color Test (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0tqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqu(B (0x(B19 ‎ (0x(B20 ‎ (0x(B21 ‎ (0x(B22 ‎ (0x(B23 ‎ (0x(B24 ‎ (0x(B25 ‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B @@ -22984,7 +22981,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23006,7 +23002,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23028,7 +23023,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23050,7 +23044,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23072,7 +23065,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23094,7 +23086,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23116,7 +23107,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23138,7 +23128,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | January 2020 | @@ -23160,7 +23149,6 @@ STDOUT is a: PIPE | | | | |MAGENTA |YELLOW |WHITE | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +-----------------------------------------------------------------------------------------------------------------------------+ | November 2019‎ | @@ -23245,7 +23233,6 @@ STDOUT is a: PIPE | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | | | | | | | | | @@ -23261,7 +23248,6 @@ STDOUT is a: PIPE | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | | | | | | | | | @@ -23269,7 +23255,6 @@ STDOUT is a: PIPE | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 | | | | | | | | | | | @@ -23277,7 +23262,6 @@ STDOUT is a: PIPE | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ ┌────────────────────────────────────────────────────────────────────────────┐ │ November 2019‎ │ @@ -24332,7 +24316,6 @@ No reminders. | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |2 |3 |4 |5 |6 |7 |8 | | | | | | | | | @@ -24340,7 +24323,6 @@ No reminders. | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |9 |10 |11 |12 |13 |14 |15 | | | | | | | | | @@ -24348,7 +24330,6 @@ No reminders. | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |16 |17 |18 |19 |20 |21 |22 | | | | | | | | | @@ -24366,7 +24347,6 @@ No reminders. | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |30 | | | | | | | | | | | | | | | @@ -24374,7 +24354,6 @@ No reminders. | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ +----------------------------------------------------------------------------+ | November 2023 | @@ -25167,7 +25146,6 @@ TRANSLATE "yesterday" "" | | | | | | | | | | | | | | | | | | | | | | | | -| | | | | | | | +----------+----------+----------+----------+----------+----------+----------+ |4 ‎ |5 ‎ |6 ‎ |7 ‎ |8 ‎ |9 ‎ |10 ‎ | | | | | | | | |