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

Patch 8.2.1549
Problem:    The "r" command fails for keys with modifiers if 'esckeys' is off
            and modifyOtherKeys is used. (Lauri Tirkkonen)
Solution:   Temporarily disable bracketed paste and modifyOtherKeys if
            'esckeys' is off. (closes #6809)
Files:      src/normal.c


*** ../vim-8.2.1548/src/normal.c	2020-08-23 21:46:29.075938591 +0200
--- src/normal.c	2020-08-30 20:42:12.947182756 +0200
***************
*** 895,903 ****
--- 895,917 ----
  	    if (lang && curbuf->b_p_iminsert == B_IMODE_IM)
  		im_set_active(TRUE);
  #endif
+ 	    if ((State & INSERT) && !p_ek)
+ 	    {
+ 		// Disable bracketed paste and modifyOtherKeys here, we won't
+ 		// recognize the escape sequences with 'esckeys' off.
+ 		out_str(T_BD);
+ 		out_str(T_CTE);
+ 	    }
  
  	    *cp = plain_vgetc();
  
+ 	    if ((State & INSERT) && !p_ek)
+ 	    {
+ 		// Re-enable bracketed paste mode and modifyOtherKeys
+ 		out_str(T_BE);
+ 		out_str(T_CTI);
+ 	    }
+ 
  	    if (langmap_active)
  	    {
  		// Undo the decrement done above
*** ../vim-8.2.1548/src/version.c	2020-08-30 19:42:02.949565997 +0200
--- src/version.c	2020-08-30 20:46:09.390436111 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     1549,
  /**/

-- 
Just think of all the things we haven't thought of yet.

 /// 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    ///