Mercurial > vim
changeset 16770:09c81f17f83c v8.1.1387
patch 8.1.1387: calling prop_add() in an empty buffer doesn't work
commit https://github.com/vim/vim/commit/d79eef2eb1f24b53206c4e55b80a4634f548c429
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 24 20:41:55 2019 +0200
patch 8.1.1387: calling prop_add() in an empty buffer doesn't work
Problem: Calling prop_add() in an empty buffer doesn't work. (Dominique
Pelle)
Solution: Open the memline before adding a text property. (closes #4412)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 24 May 2019 20:45:05 +0200 |
| parents | 6ba2457a0be4 |
| children | 1490c5a1fccc |
| files | src/testdir/test_textprop.vim src/textprop.c src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -752,3 +752,11 @@ func Test_textprop_screenshot_visual() " Same, but delete four columns call RunTestVisualBlock(4, '02') endfunc + +" Adding a text property to a new buffer should not fail +func Test_textprop_empty_buffer() + call prop_type_add('comment', {'highlight': 'Search'}) + new + call prop_add(1, 1, {'type': 'comment'}) + close +endfunc
--- a/src/textprop.c +++ b/src/textprop.c @@ -12,6 +12,7 @@ * * TODO: * - Adjust text property column and length when text is inserted/deleted. + * -> :substitute with multiple matches, issue #4427 * -> a :substitute with a multi-line match * -> search for changed_bytes() from misc1.c * -> search for mark_col_adjust() @@ -238,6 +239,9 @@ f_prop_add(typval_T *argvars, typval_T * return; } + if (buf->b_ml.ml_mfp == NULL) + ml_open(buf); + for (lnum = start_lnum; lnum <= end_lnum; ++lnum) { colnr_T col; // start column @@ -327,7 +331,7 @@ get_text_props(buf_T *buf, linenr_T lnum // Be quick when no text property types have been defined or the buffer, // unless we are adding one. - if (!buf->b_has_textprop && !will_change) + if ((!buf->b_has_textprop && !will_change) || buf->b_ml.ml_mfp == NULL) return 0; // Fetch the line to get the ml_line_len field updated.