| commit | 87be9be1db6b6d8fb57ef14e05f23a84e5e8bea0 | [log] [tgz] |
|---|---|---|
| author | Bram Moolenaar <Bram@vim.org> | Sat May 30 15:32:02 2020 +0200 |
| committer | Bram Moolenaar <Bram@vim.org> | Sat May 30 15:32:02 2020 +0200 |
| tree | f48a2f1809c3ce3f589b34fbebd219a4d21bc5fd | |
| parent | a9d4b84d97fb74061eeb42c1433e111fb58825dc [diff] [blame] |
patch 8.2.0845: text properties crossing lines not handled correctly
Problem: Text properties crossing lines not handled correctly.
Solution: When joining lines merge text properties if possible.
(Axel Forsman, closes #5839, closes #5683)
diff --git a/src/version.c b/src/version.c index 2a33137..16dfa27 100644 --- a/src/version.c +++ b/src/version.c
@@ -747,6 +747,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 845, +/**/ 844, /**/ 843,