From fd674c875bb129a2e7d5f59d85583a0ee8f3c97b Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Wed, 20 Jun 2018 00:00:18 -0400
Subject: vim-patch:8.0.0286: not always redrawing after screen resize

Problem:    When concealing is active and the screen is resized in the GUI it
            is not immediately redrawn.
Solution:   Use update_prepare() and update_finish() from
            update_single_line().
https://github.com/vim/vim/commit/c10f0e7cb0f35eea489b038e56c87b818eee975b
---
 src/nvim/screen.c | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 5166bc2e42..f6e082f92e 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -477,6 +477,25 @@ void update_screen(int type)
 
 }
 
+// Prepare for updating one or more windows.
+// Caller must check for "updating_screen" already set to avoid recursiveness.
+static void update_prepare(void)
+{
+  updating_screen = true;
+  start_search_hl();
+}
+
+// Finish updating one or more windows.
+static void update_finish(void)
+{
+  if (redraw_cmdline) {
+    showmode();
+  }
+
+  end_search_hl();
+  updating_screen = false;
+}
+
 /*
  * Return TRUE if the cursor line in window "wp" may be concealed, according
  * to the 'concealcursor' option.
@@ -522,10 +541,11 @@ void update_single_line(win_T *wp, linenr_T lnum)
   if (linebuf_char == NULL || updating_screen) {
     return;
   }
-  updating_screen = true;
 
   if (lnum >= wp->w_topline && lnum < wp->w_botline
       && foldedCount(wp, lnum, &win_foldinfo) == 0) {
+    update_prepare();
+
     row = 0;
     for (j = 0; j < wp->w_lines_valid; ++j) {
       if (lnum == wp->w_lines[j].wl_lnum) {
@@ -541,33 +561,10 @@ void update_single_line(win_T *wp, linenr_T lnum)
       }
       row += wp->w_lines[j].wl_size;
     }
+
+    update_finish();
   }
   need_cursor_line_redraw = false;
-  updating_screen = false;
-}
-
-
-/*
- * Prepare for updating one or more windows.
- * Caller must check for "updating_screen" already set to avoid recursiveness.
- */
-static void update_prepare(void)
-{
-    updating_screen = TRUE;
-    start_search_hl();
-}
-
-/*
- * Finish updating one or more windows.
- */
-static void update_finish(void)
-{
-    if (redraw_cmdline) {
-        showmode();
-    }
-
-    end_search_hl();
-    updating_screen = FALSE;
 }
 
 void update_debug_sign(const buf_T *const buf, const linenr_T lnum)
-- 
cgit 


From 40f7ce96c32f1e19a1b432ac8f938673f917f72b Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 5 Jan 2019 09:43:02 -0500
Subject: vim-patch:8.1.0674: leaking memory when updating a single line

Problem:    Leaking memory when updating a single line.
Solution:   Do not call start_search_hl() twice.
https://github.com/vim/vim/commit/6d5b4f566a2a50c1de7300336e9e4f5e761500a8
---
 src/nvim/screen.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index f6e082f92e..528a14e83c 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -550,13 +550,11 @@ void update_single_line(win_T *wp, linenr_T lnum)
     for (j = 0; j < wp->w_lines_valid; ++j) {
       if (lnum == wp->w_lines[j].wl_lnum) {
         init_search_hl(wp);
-        start_search_hl();
         prepare_search_hl(wp, lnum);
         update_window_hl(wp, false);
         // allocate window grid if not already
         win_grid_alloc(wp);
         win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, false, false);
-        end_search_hl();
         break;
       }
       row += wp->w_lines[j].wl_size;
-- 
cgit 


From 624f5c8be38bda72e68c424001bdeacee88bc197 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 5 Jan 2019 17:20:41 -0500
Subject: vim-patch:8.1.0683: spell highlighting does not always end

Problem:    Spell highlighting does not always end. (Gary Johnson)
Solution:   Also reset char_attr when spell errors are highlighted.
https://github.com/vim/vim/commit/637532b3c0ca41f0de7e90b6f3c0defe06369372
---
 src/nvim/screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 528a14e83c..98b0378b18 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2936,8 +2936,8 @@ win_line (
       break;
     }
 
-    if (draw_state == WL_LINE && area_highlighting) {
-      /* handle Visual or match highlighting in this line */
+    if (draw_state == WL_LINE && (area_highlighting || has_spell)) {
+      // handle Visual or match highlighting in this line
       if (vcol == fromcol
           || (vcol + 1 == fromcol && n_extra == 0
               && utf_ptr2cells(ptr) > 1)
-- 
cgit