diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-17 21:55:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-17 21:55:24 +0200 |
| commit | 3cea8a9a51c7b26a01a75dc29d9d8a621fc70b57 (patch) | |
| tree | c0e838e2295808258b37315051c538aff8c6d638 | |
| parent | b1ba9abcb385b0a5355788a7eefef78ec68d2f65 (diff) | |
| download | vim-git-3cea8a9a51c7b26a01a75dc29d9d8a621fc70b57.tar.gz | |
patch 8.1.2169: terminal flags are never resetv8.1.2169
Problem: Terminal flags are never reset.
Solution: Reset the flags when setting 'term'.
| -rw-r--r-- | src/term.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_termcodes.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c index 2158fe37f..b28712169 100644 --- 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 index 0a4170e38..ae20280fe 100644 --- 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 index 4f0e6faa5..78d0dc9ba 100644 --- 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, |