To: vim_dev@googlegroups.com Subject: Patch 8.2.2564 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2564 Problem: Focus events end Insert mode if 'esckeys' is not set. Solution: Do not enable focus events when 'esckeys' is off. (closes #7926) Files: src/term.c *** ../vim-8.2.2563/src/term.c 2021-01-30 15:39:44.308670961 +0100 --- src/term.c 2021-03-03 15:23:16.707013797 +0100 *************** *** 2071,2076 **** --- 2071,2077 ---- focus_mode = TRUE; focus_state = TRUE; + need_gather = TRUE; } #endif *************** *** 3618,3626 **** out_str(T_KS); // start "keypad transmit" mode out_str(T_BE); // enable bracketed paste mode ! #if (defined(UNIX) || defined(VMS)) ! // enable xterm's focus reporting mode ! if (focus_mode && *T_FE != NUL) out_str(T_FE); #endif --- 3619,3627 ---- out_str(T_KS); // start "keypad transmit" mode out_str(T_BE); // enable bracketed paste mode ! #if defined(UNIX) || defined(VMS) ! // Enable xterm's focus reporting mode when 'esckeys' is set. ! if (focus_mode && p_ek && *T_FE != NUL) out_str(T_FE); #endif *************** *** 3676,3684 **** ch_log_output = TRUE; #endif ! #if (defined(UNIX) || defined(VMS)) ! // disable xterm's focus reporting mode ! if (focus_mode && *T_FD != NUL) out_str(T_FD); #endif --- 3677,3685 ---- ch_log_output = TRUE; #endif ! #if defined(UNIX) || defined(VMS) ! // Disable xterm's focus reporting mode if 'esckeys' is set. ! if (focus_mode && p_ek && *T_FD != NUL) out_str(T_FD); #endif *** ../vim-8.2.2563/src/version.c 2021-03-03 13:25:59.535913158 +0100 --- src/version.c 2021-03-03 15:02:53.298020180 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2564, /**/ -- ARTHUR: CHARGE! [The mighty ARMY charges. Thundering noise of feet. Clatter of coconuts. Shouts etc. Suddenly there is a wail of a siren and a couple of police cars roar round in front of the charging ARMY and the POLICE leap out and stop them. TWO POLICEMAN and the HISTORIAN'S WIFE. Black Marias skid up behind them.] HISTORIAN'S WIFE: They're the ones, I'm sure. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///