To: vim_dev@googlegroups.com Subject: Patch 8.2.4557 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4557 Problem: Confusing comment about 'cursorlineopt'. Solution: Adjust comment. (closes #9939) Add parenthesis around logical OR. Files: src/drawline.c *** ../vim-8.2.4556/src/drawline.c 2022-03-06 20:46:55.700626925 +0000 --- src/drawline.c 2022-03-13 13:37:39.506446059 +0000 *************** *** 1182,1189 **** #ifdef FEAT_SYN_HL // When 'cursorline' is set highlight the line number of // the current line differently. ! // When 'cursorlineopt' has "screenline" only highlight ! // the line number itself. // TODO: Can we use CursorLine instead of CursorLineNr // when CursorLineNr isn't set? if (wp->w_p_cul --- 1182,1189 ---- #ifdef FEAT_SYN_HL // When 'cursorline' is set highlight the line number of // the current line differently. ! // When 'cursorlineopt' does not have "line" only ! // highlight the line number itself. // TODO: Can we use CursorLine instead of CursorLineNr // when CursorLineNr isn't set? if (wp->w_p_cul *************** *** 1191,1197 **** && (wp->w_p_culopt_flags & CULOPT_NBR) && (row == startrow + filler_lines || (row > startrow + filler_lines ! && wp->w_p_culopt_flags & CULOPT_LINE))) char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); #endif if (wp->w_p_rnu && lnum < wp->w_cursor.lnum --- 1191,1197 ---- && (wp->w_p_culopt_flags & CULOPT_NBR) && (row == startrow + filler_lines || (row > startrow + filler_lines ! && (wp->w_p_culopt_flags & CULOPT_LINE)))) char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); #endif if (wp->w_p_rnu && lnum < wp->w_cursor.lnum *** ../vim-8.2.4556/src/version.c 2022-03-13 13:12:23.767131845 +0000 --- src/version.c 2022-03-13 13:40:21.893996110 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4557, /**/ -- hundred-and-one symptoms of being an internet addict: 248. You sign your letters with your e-mail address instead of your name. /// 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 ///