Patch 8.2.3354

[Bram Moolenaar]

Patch 8.2.3354
Problem: Build failure with +byte_offset but without +textprop. (John
Marriott)
Solution: Adjust the #ifdef.
Files: src/memline.c


*** ../vim-8.2.3353/src/memline.c 2021-08-15 14:28:17.690235048 +0200
--- src/memline.c 2021-08-15 22:13:36.575739413 +0200
***************
*** 3977,3983 ****
*/
if ((int)dp->db_free >= extra)
{
! #ifdef FEAT_BYTEOFF
int old_prop_len = 0;
#endif
// if the length changes and there are following lines
--- 3977,3983 ----
*/
if ((int)dp->db_free >= extra)
{
! #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
int old_prop_len = 0;
#endif
// if the length changes and there are following lines
***************
*** 3998,4004 ****
// adjust free space
dp->db_free -= extra;
dp->db_txt_start -= extra;
! #ifdef FEAT_BYTEOFF
if (buf->b_has_textprop)
old_prop_len = old_len - STRLEN(new_line) - 1;
#endif
--- 3998,4004 ----
// adjust free space
dp->db_free -= extra;
dp->db_txt_start -= extra;
! #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
if (buf->b_has_textprop)
old_prop_len = old_len - STRLEN(new_line) - 1;
#endif
***************
*** 4006,4012 ****
// copy new line into the data block
mch_memmove(old_line - extra, new_line, (size_t)new_len);
buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS);
! #ifdef FEAT_BYTEOFF
// The else case is already covered by the insert and delete
if (buf->b_has_textprop)
{
--- 4006,4012 ----
// copy new line into the data block
mch_memmove(old_line - extra, new_line, (size_t)new_len);
buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS);
! #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
// The else case is already covered by the insert and delete
if (buf->b_has_textprop)
{
*** ../vim-8.2.3353/src/version.c 2021-08-15 20:36:24.367246779 +0200
--- src/version.c 2021-08-15 22:13:48.655711407 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3354,
/**/

--
ARTHUR: But if he was dying, he wouldn't bother to carve
"Aaaaarrrrrrggghhh". He'd just say it.
BROTHER MAYNARD: It's down there carved in stone.
GALAHAD: Perhaps he was dictating.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// 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 ///