diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-06 22:23:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-06 22:23:40 +0100 |
| commit | 83bf11a1ffc5a7bc4a5ba81747df606d69c1465a (patch) | |
| tree | fd502f525988c5640027baafddacccc4ce856974 | |
| parent | da70cf30ef9c03e5645de0df6f7d44ffb6b31f58 (diff) | |
patch 9.0.0160: some diff mode tests failv9.0.0160
Problem: Some diff mode tests fail.
Solution: Only advance "ptr" when a text property follows.
| -rw-r--r-- | src/drawline.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/drawline.c b/src/drawline.c index fb662f71bd..6b0d5b5838 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -3473,7 +3473,7 @@ win_line( ) || lcs_eol_one == -1) break; #ifdef FEAT_PROP_POPUP - if (!wp->w_p_wrap) + if (!wp->w_p_wrap && text_prop_follows) { // do not output more of the line, only the "below" prop ptr += STRLEN(ptr); diff --git a/src/version.c b/src/version.c index 813ff63e0e..a4cafbda23 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 160, +/**/ 159, /**/ 158, |