Mercurial > vim

comparison src/drawline.c @ 32084:fe1550f920d8 v9.0.1373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1373: wrong text displayed when using both 'linebreak' and 'list' Commit: https://github.com/vim/vim/commit/194555c001f2b8576483ef34511450b6e9b5e3fd Author: h-east <h.east.727@gmail.com> Date: Thu Mar 2 18:49:09 2023 +0000 patch 9.0.1373: wrong text displayed when using both 'linebreak' and 'list' Problem: Wrong text displayed when using both 'linebreak' and 'list'. Solution: Only set "c_extra" to NUL when "p_extra" is not empty. (Hirohito Higashi, closes #12065)
author Bram Moolenaar <Bram@vim.org>
date Thu, 02 Mar 2023 20:00:04 +0100
parents a7801ecf7df9
children 0df66713766e
comparison
equal deleted inserted replaced
32083:f3e0377c99a3 32084:fe1550f920d8
3093 { 3093 {
3094 c = (wlv.n_extra == 0 && wp->w_lcs_chars.tab3) 3094 c = (wlv.n_extra == 0 && wp->w_lcs_chars.tab3)
3095 ? wp->w_lcs_chars.tab3 3095 ? wp->w_lcs_chars.tab3
3096 : wp->w_lcs_chars.tab1; 3096 : wp->w_lcs_chars.tab1;
3097 #ifdef FEAT_LINEBREAK 3097 #ifdef FEAT_LINEBREAK
3098 if (wp->w_p_lbr && wlv.p_extra != NULL) 3098 if (wp->w_p_lbr && wlv.p_extra != NULL
3099 && *wlv.p_extra != NUL)
3099 wlv.c_extra = NUL; // using p_extra from above 3100 wlv.c_extra = NUL; // using p_extra from above
3100 else 3101 else
3101 #endif 3102 #endif
3102 wlv.c_extra = wp->w_lcs_chars.tab2; 3103 wlv.c_extra = wp->w_lcs_chars.tab2;
3103 wlv.c_final = wp->w_lcs_chars.tab3; 3104 wlv.c_final = wp->w_lcs_chars.tab3;