diff options
| author | Dylan Thacker-Smith <dylan.ah.smith@gmail.com> | 2024-03-26 18:05:01 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-26 18:05:01 +0100 |
| commit | c8b47f26d8ae0db2d65a1cd34d7e34a2c7a6b462 (patch) | |
| tree | 6db76421e9f5a9ef0f51da53ac8d57dbb1d654b3 | |
| parent | 076faac5378cf517baa8c331c57488d39efadec0 (diff) | |
patch 9.1.0206: unused display_text_first boolean var in win_line()v9.1.0206
Problem: unused display_text_first boolean var in win_line()
Solution: Remove unused display_text_first boolean variable
(Dylan Thacker-Smith)
The only place it is used, uses its initial constant value, then the
following conditionally values set to the variable are unused.
Specifically, it was commit 234c3fab28c14846b962c90097496b27ee1b4df8
that changed the use of display_text_first such that it doesn't have any
effect.
closes: #14305
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/drawline.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/drawline.c b/src/drawline.c index a8de449af4..103760fa18 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2072,8 +2072,6 @@ win_line( // not on the next char yet, don't start another prop --bcol; # endif - int display_text_first = FALSE; - // Add any text property that starts in this column. // With 'nowrap' and not in the first screen line only "below" // text prop can show. @@ -2109,8 +2107,7 @@ win_line( text_prop_id = 0; reset_extra_attr = FALSE; } - if (text_props_active > 0 && wlv.n_extra == 0 - && !display_text_first) + if (text_props_active > 0 && wlv.n_extra == 0) { int used_tpi = -1; int used_attr = 0; @@ -2157,8 +2154,6 @@ win_line( // skip this prop, first display the '$' after // the line or display an empty line text_prop_follows = TRUE; - if (used_tpi < 0) - display_text_first = TRUE; continue; } @@ -2172,7 +2167,6 @@ win_line( text_prop_flags = pt->pt_flags; text_prop_id = tp->tp_id; used_tpi = tpi; - display_text_first = FALSE; } } if (text_prop_id < 0 && used_tpi >= 0 diff --git a/src/version.c b/src/version.c index 5d90323683..76bfd10260 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 206, +/**/ 205, /**/ 204, |