Mercurial > vim

diff 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
line wrap: on
line diff
--- a/src/main.c
+++ b/src/main.c
@@ -1170,6 +1170,10 @@ main_loop(
 	    // locked, this would be a good time to handle the drop.
 	    handle_any_postponed_drop();
 #endif
+#ifdef FEAT_CONCEAL
+	    if (curwin->w_p_cole == 0)
+		conceal_update_lines = FALSE;
+#endif
 
 	    /* Trigger CursorMoved if the cursor moved. */
 	    if (!finish_op && (
@@ -1201,6 +1205,7 @@ main_loop(
 			|| need_cursor_line_redraw))
 	    {
 		if (conceal_old_cursor_line != conceal_new_cursor_line
+			&& conceal_old_cursor_line != 0
 			&& conceal_old_cursor_line
 						<= curbuf->b_ml.ml_line_count)
 		    redrawWinline(curwin, conceal_old_cursor_line);