Mercurial > vim
diff src/ops.c @ 18763:49b78d6465e5 v8.1.2371
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Commit: https://github.com/vim/vim/commit/05ad5ff0ab34ed9a5296dedd420ca81698b8ce22
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 22:48:27 2019 +0100
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/5291)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Nov 2019 23:00:05 +0100 |
| parents | 788d76db02ac |
| children | 7982f65d8f54 |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -828,7 +828,7 @@ op_delete(oparg_T *oap) /* replace the line */ ml_replace(lnum, newp, FALSE); -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (curbuf->b_has_textprop && n != 0) adjust_prop_columns(lnum, bd.textcol, -n, 0); #endif @@ -1948,7 +1948,7 @@ do_join( int remove_comments = (use_formatoptions == TRUE) && has_format_option(FO_REMOVE_COMS); int prev_was_comment; -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP textprop_T **prop_lines = NULL; int *prop_lengths = NULL; #endif @@ -2072,7 +2072,7 @@ do_join( cend = newp + sumsize; *cend = 0; -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP // We need to move properties of the lines that are going to be deleted to // the new long one. if (curbuf->b_has_textprop && !text_prop_frozen) @@ -2114,7 +2114,7 @@ do_join( (long)(cend - newp - spaces_removed), spaces_removed); if (t == 0) break; -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (prop_lines != NULL) adjust_props_for_join(curwin->w_cursor.lnum + t, prop_lines + t - 1, prop_lengths + t - 1, @@ -2129,7 +2129,7 @@ do_join( currsize = (int)STRLEN(curr); } -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (prop_lines != NULL) join_prop_lines(curwin->w_cursor.lnum, newp, prop_lines, prop_lengths, count);