From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Aug 2017 19:15:34 +0000 (+0200)
Subject: patch 8.0.0920: cursor wrong after switching altscreen in terminal
X-Git-Tag: v8.0.0920
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=893029ab20a06da9c0cf29661c9f6e2ec5583dce;p=vim

patch 8.0.0920: cursor wrong after switching altscreen in terminal

Problem:    The cursor shape is wrong after switch back from an alternate
            screen in a terminal window. (arius Gedminas)
Solution:   Change bitfield to unsigned.  Set flag that cursor shape was set.
---

diff --git a/src/libvterm/src/vterm_internal.h b/src/libvterm/src/vterm_internal.h
index d83588053..759382cb1 100644
--- a/src/libvterm/src/vterm_internal.h
+++ b/src/libvterm/src/vterm_internal.h
@@ -144,8 +144,8 @@ struct VTermState
     struct VTermPen pen;
 
     struct {
-      int cursor_visible:1;
-      int cursor_blink:1;
+      unsigned int cursor_visible:1;
+      unsigned int cursor_blink:1;
       unsigned int cursor_shape:2;
     } mode;
   } saved;
diff --git a/src/terminal.c b/src/terminal.c
index fe1d5da2f..020271a89 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1170,6 +1170,7 @@ may_set_cursor_props(term_T *term)
 {
     if (in_terminal_loop == term)
     {
+	did_change_cursor = TRUE;
 	if (term->tl_cursor_color != NULL)
 	    term_cursor_color(term->tl_cursor_color);
 	else
diff --git a/src/version.c b/src/version.c
index fa404b63d..3758ab97f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    920,
 /**/
     919,
 /**/