To: vim_dev@googlegroups.com Subject: Patch 8.2.0977 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0977 Problem: t_8u is made empty for the wrong terminals. (Dominique Pelle) Solution: Invert the check for TPR_YES. (closes #6254) Files: src/term.c, src/testdir/test_termcodes.vim *** ../vim-8.2.0976/src/term.c 2020-06-13 16:39:28.247393573 +0200 --- src/term.c 2020-06-14 14:33:14.661696200 +0200 *************** *** 4637,4642 **** --- 4637,4643 ---- // "xterm-256color" but are not fully xterm compatible. // // Gnome terminal sends 1;3801;0, 1;4402;0 or 1;2501;0. + // Newer Gnome-terminal sends 65;6001;1. // xfce4-terminal sends 1;2802;0. // screen sends 83;40500;0 // Assuming any version number over 2500 is not an *************** *** 4688,4694 **** // Unless the underline RGB color is expected to work, disable "t_8u". // It does not work for the real Xterm, it resets the background color. ! if (term_props[TPR_UNDERLINE_RGB].tpr_status == TPR_YES && *T_8U != NUL) T_8U = empty_option; // Only set 'ttymouse' automatically if it was not set --- 4689,4695 ---- // Unless the underline RGB color is expected to work, disable "t_8u". // It does not work for the real Xterm, it resets the background color. ! if (term_props[TPR_UNDERLINE_RGB].tpr_status != TPR_YES && *T_8U != NUL) T_8U = empty_option; // Only set 'ttymouse' automatically if it was not set *** ../vim-8.2.0976/src/testdir/test_termcodes.vim 2020-06-13 15:47:21.070282268 +0200 --- src/testdir/test_termcodes.vim 2020-06-14 14:32:36.357847663 +0200 *************** *** 1013,1018 **** --- 1013,1020 ---- call test_override('term_props', 1) set ttymouse=xterm + " t_8u is not reset + let &t_8u = "\[58;2;%lu;%lu;%lum" call test_option_not_set('ttymouse') let seq = "\[>1;95;0c" call feedkeys(seq, 'Lx!') *************** *** 1025,1030 **** --- 1027,1033 ---- \ underline_rgb: 'y', \ mouse: 's' \ }, terminalprops()) + call assert_equal("\[58;2;%lu;%lu;%lum", &t_8u) " Reset is_not_xterm and is_mac_terminal. set t_RV= *************** *** 1158,1166 **** \ mouse: 's' \ }, terminalprops()) ! " xterm >= 279: "sgr" and cursor_style not reset set ttymouse=xterm call test_option_not_set('ttymouse') let seq = "\[>0;279;0c" call feedkeys(seq, 'Lx!') call assert_equal(seq, v:termresponse) --- 1161,1170 ---- \ mouse: 's' \ }, terminalprops()) ! " xterm >= 279: "sgr" and cursor_style not reset; also check t_8u reset set ttymouse=xterm call test_option_not_set('ttymouse') + let &t_8u = "\[58;2;%lu;%lu;%lum" let seq = "\[>0;279;0c" call feedkeys(seq, 'Lx!') call assert_equal(seq, v:termresponse) *************** *** 1172,1177 **** --- 1176,1182 ---- \ underline_rgb: 'u', \ mouse: 's' \ }, terminalprops()) + call assert_equal('', &t_8u) set t_RV= call test_override('term_props', 0) *** ../vim-8.2.0976/src/version.c 2020-06-14 13:50:51.747717715 +0200 --- src/version.c 2020-06-14 14:33:50.277555005 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 977, /**/ -- WOMAN: I didn't know we had a king. I thought we were an autonomous collective. DENNIS: You're fooling yourself. We're living in a dictatorship. A self-perpetuating autocracy in which the working classes-- WOMAN: Oh there you go, bringing class into it again. DENNIS: That's what it's all about if only people would-- The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@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 ///