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)

diff --git a/src/normal.c b/src/normal.c
index e5fa1401c0785ea891608d60ceedd2845cc3d183..fc9e94480eb9a737e2dc62b6b81f597e88756da7 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -1076,7 +1076,10 @@ getcount:
 #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 @@ getcount:
                else
                    ca.ncharC2 = c;
            }
+           ++no_mapping;
 #endif
        }
        --no_mapping;

diff --git a/src/version.c b/src/version.c
index 47d5adb5f4e7ed9cfb8fceb87bec9d3af2dd1ef2..146b124fff0dac7899133645d47f0ef79da7d92b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    374,
 /**/
     373,
 /**/