To: vim_dev@googlegroups.com Subject: Patch 8.2.3718 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3718 Problem: Compiler warns for unused variable without the +textprop feature. (John Marriott) Solution: Adjust #ifdefs. Files: src/drawline.c *** ../vim-8.2.3717/src/drawline.c 2021-11-30 20:21:25.657045218 +0000 --- src/drawline.c 2021-12-02 11:32:28.392933952 +0000 *************** *** 265,277 **** int c_extra = NUL; // extra chars, all the same int c_final = NUL; // final char, mandatory if set int extra_attr = 0; // attributes when n_extra != 0 ! #ifdef FEAT_LINEBREAK int in_linebreak = FALSE; // n_extra set for showing linebreak #endif static char_u *at_end_str = (char_u *)""; // used for p_extra when // displaying eol at end-of-line int lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used ! int lcs_prec_todo = wp->w_lcs_chars.prec; // prec until it's been used // saved "extra" items for when draw_state becomes WL_LINE (again) int saved_n_extra = 0; --- 265,278 ---- int c_extra = NUL; // extra chars, all the same int c_final = NUL; // final char, mandatory if set int extra_attr = 0; // attributes when n_extra != 0 ! #if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP) int in_linebreak = FALSE; // n_extra set for showing linebreak #endif static char_u *at_end_str = (char_u *)""; // used for p_extra when // displaying eol at end-of-line int lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used ! int lcs_prec_todo = wp->w_lcs_chars.prec; ! // prec until it's been used // saved "extra" items for when draw_state becomes WL_LINE (again) int saved_n_extra = 0; *************** *** 1717,1723 **** ++p_extra; } --n_extra; ! #ifdef FEAT_LINEBREAK if (n_extra <= 0) in_linebreak = FALSE; #endif --- 1718,1724 ---- ++p_extra; } --n_extra; ! #if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP) if (n_extra <= 0) in_linebreak = FALSE; #endif *************** *** 2046,2053 **** --- 2047,2056 ---- c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; c_final = NUL; + # if defined(FEAT_PROP_POPUP) if (n_extra > 0 && c != TAB) in_linebreak = TRUE; + # endif if (VIM_ISWHITE(c)) { # ifdef FEAT_CONCEAL *** ../vim-8.2.3717/src/version.c 2021-12-01 17:37:56.440650135 +0000 --- src/version.c 2021-12-02 11:33:44.420854186 +0000 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 3718, /**/ -- "Beware of bugs in the above code; I have only proved it correct, not tried it." -- Donald Knuth /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///