Mercurial > vim

comparison src/drawline.c @ 29639:0fc188347f8a v9.0.0160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0160: some diff mode tests fail Commit: https://github.com/vim/vim/commit/83bf11a1ffc5a7bc4a5ba81747df606d69c1465a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 6 22:23:40 2022 +0100 patch 9.0.0160: some diff mode tests fail Problem: Some diff mode tests fail. Solution: Only advance "ptr" when a text property follows.
author Bram Moolenaar <Bram@vim.org>
date Sat, 06 Aug 2022 23:30:03 +0200
parents 592818fd3110
children b2cf1634c782
comparison
equal deleted inserted replaced
29638:e580b15a240d 29639:0fc188347f8a
3471 && !text_prop_follows 3471 && !text_prop_follows
3472 #endif 3472 #endif
3473 ) || lcs_eol_one == -1) 3473 ) || lcs_eol_one == -1)
3474 break; 3474 break;
3475 #ifdef FEAT_PROP_POPUP 3475 #ifdef FEAT_PROP_POPUP
3476 if (!wp->w_p_wrap) 3476 if (!wp->w_p_wrap && text_prop_follows)
3477 { 3477 {
3478 // do not output more of the line, only the "below" prop 3478 // do not output more of the line, only the "below" prop
3479 ptr += STRLEN(ptr); 3479 ptr += STRLEN(ptr);
3480 # ifdef FEAT_LINEBREAK 3480 # ifdef FEAT_LINEBREAK
3481 dont_use_showbreak = TRUE; 3481 dont_use_showbreak = TRUE;