Mercurial > vim

comparison src/main.c @ 15476:5b0f37d844b3 v8.1.0746

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0746: highlighting not updated with conceal and 'cursorline' commit https://github.com/vim/vim/commit/bbee8d5122b159683b3f52eddd0da85fcf1fcbfd Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 14 21:51:40 2019 +0100 patch 8.1.0746: highlighting not updated with conceal and 'cursorline' Problem: Highlighting not updated with conceal and 'cursorline'. (Jason Franklin) Solution: Do not use a zero line number. Check if 'conceallevel' is set for the current window.
author Bram Moolenaar <Bram@vim.org>
date Mon, 14 Jan 2019 22:00:06 +0100
parents 55ccc2d353bd
children 41fbbcea0f1b
comparison
equal deleted inserted replaced
15475:a695c188f6ca 15476:5b0f37d844b3
1168 #ifdef HAVE_DROP_FILE 1168 #ifdef HAVE_DROP_FILE
1169 // If files were dropped while text was locked or the curbuf was 1169 // If files were dropped while text was locked or the curbuf was
1170 // locked, this would be a good time to handle the drop. 1170 // locked, this would be a good time to handle the drop.
1171 handle_any_postponed_drop(); 1171 handle_any_postponed_drop();
1172 #endif 1172 #endif
1173 #ifdef FEAT_CONCEAL
1174 if (curwin->w_p_cole == 0)
1175 conceal_update_lines = FALSE;
1176 #endif
1173 1177
1174 /* Trigger CursorMoved if the cursor moved. */ 1178 /* Trigger CursorMoved if the cursor moved. */
1175 if (!finish_op && ( 1179 if (!finish_op && (
1176 has_cursormoved() 1180 has_cursormoved()
1177 #ifdef FEAT_CONCEAL 1181 #ifdef FEAT_CONCEAL
1199 && (conceal_old_cursor_line != conceal_new_cursor_line 1203 && (conceal_old_cursor_line != conceal_new_cursor_line
1200 || conceal_cursor_line(curwin) 1204 || conceal_cursor_line(curwin)
1201 || need_cursor_line_redraw)) 1205 || need_cursor_line_redraw))
1202 { 1206 {
1203 if (conceal_old_cursor_line != conceal_new_cursor_line 1207 if (conceal_old_cursor_line != conceal_new_cursor_line
1208 && conceal_old_cursor_line != 0
1204 && conceal_old_cursor_line 1209 && conceal_old_cursor_line
1205 <= curbuf->b_ml.ml_line_count) 1210 <= curbuf->b_ml.ml_line_count)
1206 redrawWinline(curwin, conceal_old_cursor_line); 1211 redrawWinline(curwin, conceal_old_cursor_line);
1207 redrawWinline(curwin, conceal_new_cursor_line); 1212 redrawWinline(curwin, conceal_new_cursor_line);
1208 curwin->w_valid &= ~VALID_CROW; 1213 curwin->w_valid &= ~VALID_CROW;