|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.374
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.374
|
|
|
3ef2ca |
Problem: Character after "fb" command not mapped if it might be a composing
|
|
|
3ef2ca |
character.
|
|
|
3ef2ca |
Solution: Don't disable mapping when looking for a composing character.
|
|
|
3ef2ca |
(Jacob Niehus)
|
|
|
3ef2ca |
Files: src/normal.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.373/src/normal.c 2014-04-29 12:15:22.856032651 +0200
|
|
|
3ef2ca |
--- src/normal.c 2014-07-23 12:26:26.811992854 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 1076,1082 ****
|
|
|
3ef2ca |
#ifdef FEAT_MBYTE
|
|
|
3ef2ca |
/* When getting a text character and the next character is a
|
|
|
3ef2ca |
* multi-byte character, it could be a composing character.
|
|
|
3ef2ca |
! * However, don't wait for it to arrive. */
|
|
|
3ef2ca |
while (enc_utf8 && lang && (c = vpeekc()) > 0
|
|
|
3ef2ca |
&& (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
--- 1076,1085 ----
|
|
|
3ef2ca |
#ifdef FEAT_MBYTE
|
|
|
3ef2ca |
/* When getting a text character and the next character is a
|
|
|
3ef2ca |
* multi-byte character, it could be a composing character.
|
|
|
3ef2ca |
! * However, don't wait for it to arrive. Also, do enable mapping,
|
|
|
3ef2ca |
! * because if it's put back with vungetc() it's too late to apply
|
|
|
3ef2ca |
! * mapping. */
|
|
|
3ef2ca |
! --no_mapping;
|
|
|
3ef2ca |
while (enc_utf8 && lang && (c = vpeekc()) > 0
|
|
|
3ef2ca |
&& (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 1091,1096 ****
|
|
|
3ef2ca |
--- 1094,1100 ----
|
|
|
3ef2ca |
else
|
|
|
3ef2ca |
ca.ncharC2 = c;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
+ ++no_mapping;
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
--no_mapping;
|
|
|
3ef2ca |
*** ../vim-7.4.373/src/version.c 2014-07-16 23:39:50.251084976 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-07-23 12:27:50.483992253 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 736,737 ****
|
|
|
3ef2ca |
--- 736,739 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 374,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
CART DRIVER: Bring out your dead!
|
|
|
3ef2ca |
There are legs stick out of windows and doors. Two MEN are fighting in the
|
|
|
3ef2ca |
mud - covered from head to foot in it. Another MAN is on his hands in
|
|
|
3ef2ca |
knees shovelling mud into his mouth. We just catch sight of a MAN falling
|
|
|
3ef2ca |
into a well.
|
|
|
3ef2ca |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|