updated for version 7.0222

diff --git a/src/charset.c b/src/charset.c
index 1e0e8372e90a8c5848761f74fde8b5b8023018df..7c820d24b76c68e0d007a9e9d474fcb40dabcd56 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -914,7 +914,7 @@ vim_iswordc_buf(p, buf)
 # endif
     return (GET_CHARTAB(buf, *p) != 0);
 }
-#endif /* FEAT_SYN_HL */
+#endif
 
 /*
  * return TRUE if 'c' is a valid file-name character
@@ -1464,7 +1464,7 @@ skipdigits(p)
     return p;
 }
 
-#if defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * skip over digits and hex characters
  */

diff --git a/src/misc2.c b/src/misc2.c
index dddbc5fb09e87ed0d64dca0abd4bace6e5003af5..44b05178b70d9af8ef967345d614fbebb2ca8400 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -968,7 +968,7 @@ free_all_mem()
     do_cmdline_cmd((char_u *)"only!");
 #endif
 
-# if defined(FEAT_SYN_HL)
+# if defined(FEAT_SPELL)
     /* Free all spell info. */
     spell_free_all();
 # endif
@@ -1270,7 +1270,7 @@ vim_strup(p)
     }
 }
 
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_EVAL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * Make string "s" all upper-case and return it in allocated memory.
  * Handles multi-byte characters as well as possible.
@@ -5758,7 +5758,7 @@ vimpty_getenv(string)
 
 #endif /* !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) */
 
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_EVAL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * Return 0 for not writable, 1 for writable file, 2 for a dir which we have
  * rights to write into.

diff --git a/src/regexp.c b/src/regexp.c
index a143719c867006eccea204feef2c20382147e446..2ff8ea333b0858909327b5b20407df3f0c0f759d 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1780,12 +1780,12 @@ regatom(flagp)
            }
            break;
 
-#ifdef FEAT_SYN_HL
       case Magic('z'):
        {
            c = no_Magic(getchr());
            switch (c)
            {
+#ifdef FEAT_SYN_HL
                case '(': if (reg_do_extmatch != REX_SET)
                              EMSG_RET_NULL(_("E66: \\z( not allowed here"));
                          if (one_exactly)
@@ -1810,6 +1810,7 @@ regatom(flagp)
                          ret = regnode(ZREF + c - '0');
                          re_has_z = REX_USE;
                          break;
+#endif
 
                case 's': ret = regnode(MOPEN + 0);
                          break;
@@ -1821,7 +1822,6 @@ regatom(flagp)
            }
        }
        break;
-#endif
 
       case Magic('%'):
        {