Mercurial > vim

comparison src/drawline.c @ 31223:30377fd8341e v9.0.0945

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0945: failures in the cursorline test Commit: https://github.com/vim/vim/commit/637862fc3ca68e3fc1ea9a178bd7f9d25a6e773b Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 24 23:04:02 2022 +0000 patch 9.0.0945: failures in the cursorline test Problem: Failures in the cursorline test. Solution: Reset extra_attr only after a text property.
author Bram Moolenaar <Bram@vim.org>
date Fri, 25 Nov 2022 00:15:02 +0100
parents 59de2172e99d
children 6ebd92646276
comparison
equal deleted inserted replaced
31222:0d1a192b9655 31223:30377fd8341e
2401 } 2401 }
2402 --wlv.n_extra; 2402 --wlv.n_extra;
2403 #if defined(FEAT_PROP_POPUP) 2403 #if defined(FEAT_PROP_POPUP)
2404 if (wlv.n_extra <= 0) 2404 if (wlv.n_extra <= 0)
2405 { 2405 {
2406 wlv.extra_for_textprop = FALSE;
2407 in_linebreak = FALSE;
2408
2409 // Only restore search_attr and area_attr after "n_extra" in 2406 // Only restore search_attr and area_attr after "n_extra" in
2410 // the next screen line is also done. 2407 // the next screen line is also done.
2411 if (wlv.saved_n_extra <= 0) 2408 if (wlv.saved_n_extra <= 0)
2412 { 2409 {
2413 if (search_attr == 0) 2410 if (search_attr == 0)
2414 search_attr = saved_search_attr; 2411 search_attr = saved_search_attr;
2415 if (area_attr == 0 && *ptr != NUL) 2412 if (area_attr == 0 && *ptr != NUL)
2416 area_attr = saved_area_attr; 2413 area_attr = saved_area_attr;
2417 // wlv.extra_attr should be used at this position but not 2414
2418 // any further. 2415 if (wlv.extra_for_textprop)
2419 reset_extra_attr = TRUE; 2416 // wlv.extra_attr should be used at this position but
2420 } 2417 // not any further.
2418 reset_extra_attr = TRUE;
2419 }
2420
2421 wlv.extra_for_textprop = FALSE;
2422 in_linebreak = FALSE;
2421 } 2423 }
2422 #endif 2424 #endif
2423 } 2425 }
2424 else 2426 else
2425 { 2427 {