# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1571342403 -7200
# Node ID b1796f1b28fa112de7c2db1745174711d56fb922
# Parent  3d40532727b8addc4ddc8ca8d33340af8be047c1
patch 8.1.2169: terminal flags are never reset

Commit: https://github.com/vim/vim/commit/3cea8a9a51c7b26a01a75dc29d9d8a621fc70b57
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Oct 17 21:55:24 2019 +0200

    patch 8.1.2169: terminal flags are never reset

    Problem:    Terminal flags are never reset.
    Solution:   Reset the flags when setting 'term'.

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -1957,6 +1957,8 @@ set_termname(char_u *term)
 #if defined(UNIX) || defined(VMS)
     term_is_xterm = vim_is_xterm(term);
 #endif
+    is_not_xterm = FALSE;
+    is_mac_terminal = FALSE;
 
 #ifdef FEAT_MOUSE
 # if defined(UNIX) || defined(VMS)
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -906,7 +906,18 @@ func Test_xx03_xterm_response()
   " Termresponse is only parsed when t_RV is not empty.
   set t_RV=x
 
+  " Do Terminal.app first to check that is_mac_terminal is reset.
+  set ttymouse=xterm
+  call test_option_not_set('ttymouse')
+  let seq = "\<Esc>[>1;95;0c"
+  call feedkeys(seq, 'Lx!')
+  call assert_equal(seq, v:termresponse)
+  call assert_equal('sgr', &ttymouse)
+
   " xterm < 95: "xterm" (actually unmodified)
+  set t_RV=
+  set term=xterm
+  set t_RV=x
   set ttymouse=xterm
   call test_option_not_set('ttymouse')
   let seq = "\<Esc>[>0;94;0c"
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2169,
+/**/
     2168,
 /**/
     2167,