summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-12 21:15:34 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-12 21:15:34 +0200
commit893029ab20a06da9c0cf29661c9f6e2ec5583dce (patch)
treeccdaf0549aa564a6429d29a26b5c21fb9aafa05d
parentc977092053e1a27f571f8a27126717cc28af4e58 (diff)
downloadvim-893029ab20a06da9c0cf29661c9f6e2ec5583dce.zip
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.
-rw-r--r--src/libvterm/src/vterm_internal.h4
-rw-r--r--src/terminal.c1
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
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
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 920,
+/**/
919,
/**/
918,