diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 87ea2f2..37cef12 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3344,7 +3344,7 @@
 #ifdef FEAT_DIFF
 	curwin->w_p_diff = FALSE;	/* No 'diff' */
 #endif
-#ifdef FEAT_SYN_HL
+#ifdef FEAT_SPELL
 	curwin->w_p_spell = FALSE;	/* No spell checking */
 #endif
 
@@ -4493,9 +4493,9 @@
 
 			    update_topline();
 			    validate_cursor();
-			    update_screen(NOT_VALID);
+			    update_screen(SOME_VALID);
 			    highlight_match = FALSE;
-			    redraw_later(NOT_VALID);
+			    redraw_later(SOME_VALID);
 
 #ifdef FEAT_FOLDING
 			    curwin->w_p_fen = save_p_fen;
diff --git a/src/memline.c b/src/memline.c
index 876704a..6dc23f4 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -524,7 +524,7 @@
     if (mfp == NULL || mfp->mf_fd >= 0 || !buf->b_p_swf)
 	return;		/* nothing to do */
 
-#ifdef FEAT_SYN_HL
+#ifdef FEAT_SPELL
     /* For a spell buffer use a temp file name. */
     if (buf->b_spell)
     {
@@ -2124,7 +2124,7 @@
     return ml_append_int(curbuf, lnum, line, len, newfile, FALSE);
 }
 
-#if defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_SPELL) || defined(PROTO)
 /*
  * Like ml_append() but for an arbitrary buffer.  The buffer must already have
  * a memline.