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 d83588053d4fd2e2cb4048b01e19aa589053d8c4..759382cb1e7f2d28d11c135385a08f24d8823691 100644 (file)
--- 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 fe1d5da2f546750bac315b9e95022e8e3e59b5c6..020271a89e953049a8c9b9fd52ccc24f3f256f20 100644 (file)
--- 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 fa404b63db5350d91b11013215cf05aa20e97e61..3758ab97f0f9091341bbee9d45c5a5a8d07457b2 100644 (file)
--- 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,
 /**/