Patch 8.1.2169

10 views
Skip to first unread message

Bram Moolenaar

unread,
Oct 17, 2019, 3:55:59 PM10/17/19
to vim...@googlegroups.com

Patch 8.1.2169
Problem: Terminal flags are never reset.
Solution: Reset the flags when setting 'term'.
Files: src/term.c, src/testdir/test_termcodes.vim


*** ../vim-8.1.2168/src/term.c 2019-10-13 16:43:35.952359672 +0200
--- src/term.c 2019-10-17 21:53:50.696278165 +0200
***************
*** 1957,1962 ****
--- 1957,1964 ----
#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)
*** ../vim-8.1.2168/src/testdir/test_termcodes.vim 2019-10-14 22:22:00.124902509 +0200
--- src/testdir/test_termcodes.vim 2019-10-17 21:53:21.756650824 +0200
***************
*** 906,912 ****
--- 906,923 ----
" 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"
*** ../vim-8.1.2168/src/version.c 2019-10-16 23:34:38.614482577 +0200
--- src/version.c 2019-10-17 21:47:44.786074594 +0200
***************
*** 755,756 ****
--- 755,758 ----
{ /* Add new patch number below this line */
+ /**/
+ 2169,
/**/

--
A year spent in artificial intelligence is enough to make one
believe in God.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages