Patch 8.2.4521

[Bram Moolenaar]

Patch 8.2.4521 (after 8.2.4520)
Problem: Build failure without the +diff feature. (John Marriott)
Solution: Define filler+lines if not declaring it.
Files: src/drawline.c


*** ../vim-8.2.4520/src/drawline.c 2022-03-06 19:53:52.719203716 +0000
--- src/drawline.c 2022-03-06 20:44:26.396777043 +0000
***************
*** 354,359 ****
--- 354,361 ----
#if defined(FEAT_DIFF) || defined(FEAT_SIGNS)
int filler_lines = 0; // nr of filler lines to be drawn
int filler_todo = 0; // nr of filler lines still to do + 1
+ #else
+ # define filler_lines 0
#endif
#ifdef FEAT_DIFF
hlf_T diff_hlf = (hlf_T)0; // type of diff highlighting
***************
*** 1107,1116 ****
// Display the absolute or relative line number. After the
// first fill with blanks when the 'n' flag isn't in 'cpo'
if ((wp->w_p_nu || wp->w_p_rnu)
! && (row == startrow
! #ifdef FEAT_DIFF
! + filler_lines
! #endif
|| vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
{
#ifdef FEAT_SIGNS
--- 1109,1115 ----
// Display the absolute or relative line number. After the
// first fill with blanks when the 'n' flag isn't in 'cpo'
if ((wp->w_p_nu || wp->w_p_rnu)
! && (row == startrow + filler_lines
|| vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
{
#ifdef FEAT_SIGNS
***************
*** 1127,1137 ****
#endif
{
// Draw the line number (empty space after wrapping).
! if (row == startrow
! #ifdef FEAT_DIFF
! + filler_lines
! #endif
! )
{
long num;
char *fmt = "%*ld ";
--- 1126,1132 ----
#endif
{
// Draw the line number (empty space after wrapping).
! if (row == startrow + filler_lines)
{
long num;
char *fmt = "%*ld ";
*** ../vim-8.2.4520/src/version.c 2022-03-06 19:53:52.723203711 +0000
--- src/version.c 2022-03-06 20:46:06.732676444 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4521,
/**/

--
Wizards had always known that the act of observation changed the thing that
was observed, and sometimes forgot that it also changed the observer too.
Terry Pratchett - Interesting times

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///