aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/globals.h4
-rw-r--r--src/nvim/version.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 7d1666f866..739042201f 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1052,10 +1052,6 @@ EXTERN int typebuf_was_filled INIT(= FALSE); /* received text from client
EXTERN int term_is_xterm INIT(= FALSE); /* xterm-like 'term' */
#endif
-#if defined(UNIX)
-EXTERN int xterm_conflict_mouse INIT(= FALSE);
-#endif
-
#ifdef BACKSLASH_IN_FILENAME
EXTERN char psepc INIT(= '\\'); /* normal path separator character */
EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4bdd22e819..5758619b56 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -394,7 +394,7 @@ static int included_patches[] = {
392,
391,
390,
- //389,
+ 389,
388,
387,
386,