diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index c1a02fc..5660390 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 05
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,8 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Spell checking: code for pre-compressing tree. (Olaf Seibert)
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
diff --git a/src/eval.c b/src/eval.c
index 56811ab..6919bf1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -15161,8 +15161,26 @@
 			|| *p == '{'
 			|| ((flags & FNE_INCL_BR) && (*p == '[' || *p == '.'))
 			|| mb_nest != 0
-			|| br_nest != 0); ++p)
+			|| br_nest != 0); mb_ptr_adv(p))
     {
+	if (*p == '\'')
+	{
+	    /* skip over 'string' to avoid counting [ and ] inside it. */
+	    for (p = p + 1; *p != NUL && *p != '\''; mb_ptr_adv(p))
+		;
+	    if (*p == NUL)
+		break;
+	}
+	else if (*p == '"')
+	{
+	    /* skip over "str\"ing" to avoid counting [ and ] inside it. */
+	    for (p = p + 1; *p != NUL && *p != '"'; mb_ptr_adv(p))
+		if (*p == '\\' && p[1] != NUL)
+		    ++p;
+	    if (*p == NUL)
+		break;
+	}
+
 	if (mb_nest == 0)
 	{
 	    if (*p == '[')
@@ -15170,6 +15188,7 @@
 	    else if (*p == ']')
 		--br_nest;
 	}
+
 	if (br_nest == 0)
 	{
 	    if (*p == '{')