updated for version 7.3.973

Problem:    Compiler warnings. Crash on startup. (Tony Mechelynck)
Solution:   Change EMSG2 to EMSGN. Make array one character longer.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 51e355a5fd716b046cf723082e601e1670cf1c1c..92292e502cbfc02ae49e0c8b3dcf9914b06919c2 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -273,7 +273,7 @@ nfa_recognize_char_class(start, end, extra_newl)
        NFA_HEAD, NFA_NHEAD, NFA_ALPHA, NFA_NALPHA,
        NFA_LOWER, NFA_NLOWER, NFA_UPPER, NFA_NUPPER
     };
-    char_u     myconfig[9];
+    char_u     myconfig[10];
     char_u     config[NCONFIGS][9] = {
        "000000100",    /* digit */
        "100000100",    /* non digit */
@@ -400,7 +400,7 @@ nfa_recognize_char_class(start, end, extra_newl)
     }
     /* try to recognize character classes */
     for (i = 0; i < NCONFIGS; i++)
-       if (STRNCMP(myconfig, config[i],8) == 0)
+       if (STRNCMP(myconfig, config[i], 8) == 0)
            return classid[i] + extra_newl;
 
     /* fallthrough => no success so far */
@@ -759,7 +759,7 @@ nfa_regatom()
        case Magic('&'):
        case Magic(')'):
            syntax_error = TRUE;
-           EMSG2(_(e_misplaced), no_Magic(c));
+           EMSGN(_(e_misplaced), no_Magic(c));
            return FAIL;
 
        case Magic('='):
@@ -770,7 +770,7 @@ nfa_regatom()
        case Magic('{'):
            /* these should follow an atom, not form an atom */
            syntax_error = TRUE;
-           EMSG2(_(e_misplaced), no_Magic(c));
+           EMSGN(_(e_misplaced), no_Magic(c));
            return FAIL;
 
        case Magic('~'):                /* previous substitute pattern */
@@ -816,7 +816,7 @@ nfa_regatom()
                    return FAIL;
                default:
                    syntax_error = TRUE;
-                   EMSG2(_("E867: (NFA) Unknown operator '\\z%c'"),
+                   EMSGN(_("E867: (NFA) Unknown operator '\\z%c'"),
                                                                 no_Magic(c));
                    return FAIL;
            }
@@ -1363,7 +1363,7 @@ nfa_regpiece()
                    return FAIL;
                default:
                    syntax_error = TRUE;
-                   EMSG2(_("E869: (NFA) Unknown operator '\\@%c'"), op);
+                   EMSGN(_("E869: (NFA) Unknown operator '\\@%c'"), op);
                    return FAIL;
            }
            break;

diff --git a/src/version.c b/src/version.c
index 7cb69987c2e624099d76b9b87aeaa9f8148fbe06..f9dd5428d11c3abb9fc83705910b2afd3d494926 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    973,
 /**/
     972,
 /**/