astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
86ddcf1
To: vim_dev@googlegroups.com
86ddcf1
Subject: Patch 7.4.382
86ddcf1
Fcc: outbox
86ddcf1
From: Bram Moolenaar <Bram@moolenaar.net>
86ddcf1
Mime-Version: 1.0
86ddcf1
Content-Type: text/plain; charset=UTF-8
86ddcf1
Content-Transfer-Encoding: 8bit
86ddcf1
------------
86ddcf1
86ddcf1
Patch 7.4.382
86ddcf1
Problem:    Mapping characters may not work after typing Esc in Insert mode.
86ddcf1
Solution:   Fix the noremap flags for inserted characters. (Jacob Niehus)
86ddcf1
Files:	    src/getchar.c
86ddcf1
86ddcf1
86ddcf1
*** ../vim-7.4.381/src/getchar.c	2014-06-25 14:39:35.102348584 +0200
86ddcf1
--- src/getchar.c	2014-07-23 20:10:25.651792765 +0200
86ddcf1
***************
86ddcf1
*** 2731,2736 ****
86ddcf1
--- 2731,2741 ----
86ddcf1
  		}
86ddcf1
  		if (c < 0)
86ddcf1
  		    continue;	/* end of input script reached */
86ddcf1
+ 
86ddcf1
+ 		/* Allow mapping for just typed characters. When we get here c
86ddcf1
+ 		 * is the number of extra bytes and typebuf.tb_len is 1. */
86ddcf1
+ 		for (n = 1; n <= c; ++n)
86ddcf1
+ 		    typebuf.tb_noremap[typebuf.tb_off + n] = RM_YES;
86ddcf1
  		typebuf.tb_len += c;
86ddcf1
  
86ddcf1
  		/* buffer full, don't map */
86ddcf1
*** ../vim-7.4.381/src/version.c	2014-07-23 17:39:21.815857910 +0200
86ddcf1
--- src/version.c	2014-07-23 18:26:42.663837492 +0200
86ddcf1
***************
86ddcf1
*** 736,737 ****
86ddcf1
--- 736,739 ----
86ddcf1
  {   /* Add new patch number below this line */
86ddcf1
+ /**/
86ddcf1
+     382,
86ddcf1
  /**/
86ddcf1
86ddcf1
-- 
86ddcf1
DENNIS: Oh, very nice. King, eh!  I expect you've got a palace and fine
86ddcf1
        clothes and courtiers and plenty of food.  And how d'you get that?  By
86ddcf1
        exploiting the workers! By hanging on to outdated imperialist dogma
86ddcf1
        which perpetuates the social and economic differences in our society!
86ddcf1
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
86ddcf1
86ddcf1
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
86ddcf1
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
86ddcf1
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
86ddcf1
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///