Permalink
Browse files

updated for version 7.4.374

Problem:    Character after "fb" command not mapped if it might be a composing
            character.
Solution:   Don't disable mapping when looking for a composing character.
            (Jacob Niehus)
  • Loading branch information...
brammool committed Jul 23, 2014
1 parent 07d8779 commit 4f88062c556e52368d65991f5ae74cf0f8b17f2d
Showing with 7 additions and 1 deletion.
  1. +5 −1 src/normal.c
  2. +2 −0 src/version.c
View
@@ -1076,7 +1076,10 @@ normal_cmd(oap, toplevel)
#ifdef FEAT_MBYTE
/* When getting a text character and the next character is a
* multi-byte character, it could be a composing character.
* However, don't wait for it to arrive. */
* However, don't wait for it to arrive. Also, do enable mapping,
* because if it's put back with vungetc() it's too late to apply
* mapping. */
--no_mapping;
while (enc_utf8 && lang && (c = vpeekc()) > 0
&& (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
{
@@ -1091,6 +1094,7 @@ normal_cmd(oap, toplevel)
else
ca.ncharC2 = c;
}
++no_mapping;
#endif
}
--no_mapping;
View
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
374,
/**/
373,
/**/

0 comments on commit 4f88062

Please sign in to comment.