summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-27 23:24:16 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-27 23:24:16 +0200
commita06afc7f5e7ba085abf1475a65ae3ea79c961a0e (patch)
tree30b4a9e876592e0c53bef46e5e168155d8f7a6d3
parent4cbdf155ca7bb6fbdab2d5acafae5fc712fca8b8 (diff)
downloadvim-git-a06afc7f5e7ba085abf1475a65ae3ea79c961a0e.tar.gz
patch 8.1.0329: using inputlist() during startup results in garbagev8.1.0329
Problem: Using inputlist() during startup results in garbage. (Dominique Pelle) Solution: Make sure the xterm tracing is stopped when disabling the mouse.
-rw-r--r--src/os_unix.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 080f03c7b..99662218b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3664,6 +3664,13 @@ mch_setmouse(int on)
# endif
int xterm_mouse_vers;
+# if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
+ if (!on)
+ // Make sure not tracing mouse movements. Important when a button-down
+ // was received but no release yet.
+ stop_xterm_trace();
+# endif
+
if (on == mouse_ison
# ifdef FEAT_BEVAL_TERM
&& p_bevalterm == bevalterm_ison
diff --git a/src/version.c b/src/version.c
index 53089f5d0..26b6888c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 329,
+/**/
328,
/**/
327,