To: vim_dev@googlegroups.com
Subject: Patch 9.0.0976
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0976
Problem:    Enabling the kitty keyboard protocol uses push/pop.
Solution:   Use the start/stop codes to avoid unpredictable behavior.
Files:      runtime/doc/options.txt, src/term.c


*** ../vim-9.0.0975/runtime/doc/options.txt	2022-11-25 15:09:30.706402878 +0000
--- runtime/doc/options.txt	2022-11-30 10:20:30.062913084 +0000
***************
*** 4868,4874 ****
  		mok2	modifyOtherKeys level 2, as supported by xterm
  		kitty	Kitty keyboard protocol, as supported by Kitty
  
! 	The option value is a list of command separated items.  Each item has
  	a pattern that is matched against the 'term' option, a colon and the
  	protocol name to be used.  To illustrate this, the default value would
  	be set with: >
--- 4901,4907 ----
  		mok2	modifyOtherKeys level 2, as supported by xterm
  		kitty	Kitty keyboard protocol, as supported by Kitty
  
! 	The option value is a list of comma separated items.  Each item has
  	a pattern that is matched against the 'term' option, a colon and the
  	protocol name to be used.  To illustrate this, the default value would
  	be set with: >
***************
*** 4893,4904 ****
  			    CSI >4;m	disables modifyOtherKeys
  			The t_TI value is changed to:
  			    CSI >4;2m	enables modifyOtherKeys
  
  		kitty	The t_TE value is changed to:
  			    CSI >4;m	disables modifyOtherKeys
! 			    CSI <u	disables the kitty keyboard protocol
  			The t_TI value is changed to:
! 			    CSI >1u	enables the kitty keyboard protocol
  			    CSI ?u	request kitty keyboard protocol state
  			    CSI >c	request the termresponse
  
--- 4926,4938 ----
  			    CSI >4;m	disables modifyOtherKeys
  			The t_TI value is changed to:
  			    CSI >4;2m	enables modifyOtherKeys
+ 			    CSI ?4m	request the modifyOtherKeys state
  
  		kitty	The t_TE value is changed to:
  			    CSI >4;m	disables modifyOtherKeys
! 			    CSI =0;1u	disables the kitty keyboard protocol
  			The t_TI value is changed to:
! 			    CSI =1;1u	enables the kitty keyboard protocol
  			    CSI ?u	request kitty keyboard protocol state
  			    CSI >c	request the termresponse
  
*** ../vim-9.0.0975/src/term.c	2022-11-29 20:33:16.592850638 +0000
--- src/term.c	2022-11-30 10:12:41.374117483 +0000
***************
*** 608,618 ****
  static tcap_entry_T builtin_kitty[] = {
      // t_TI enables the kitty keyboard protocol, requests the kitty keyboard
      // protocol state and requests the version response.
!     {(int)KS_CTI,	"\033[>1u\033[?u\033[>c"},
  
      // t_TE also disabled modifyOtherKeys, because t_TI from xterm may already
      // have been used.
!     {(int)KS_CTE,	"\033[>4;m\033[<u"},
  
      {(int)KS_NAME,	NULL}  // end marker
  };
--- 608,618 ----
  static tcap_entry_T builtin_kitty[] = {
      // t_TI enables the kitty keyboard protocol, requests the kitty keyboard
      // protocol state and requests the version response.
!     {(int)KS_CTI,	"\033[=1;1u\033[?u\033[>c"},
  
      // t_TE also disabled modifyOtherKeys, because t_TI from xterm may already
      // have been used.
!     {(int)KS_CTE,	"\033[>4;m\033[=0;1u"},
  
      {(int)KS_NAME,	NULL}  // end marker
  };
*** ../vim-9.0.0975/src/version.c	2022-11-29 21:36:52.130387013 +0000
--- src/version.c	2022-11-30 10:21:34.870980602 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     976,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
182. You may not know what is happening in the world, but you know
     every bit of net-gossip there is.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///