updated for version 7.0125

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index c1a02fc94f5cc6ddcf23a706dd037419092b3de3..5660390a91d47e49467b16fee4450367c5675ff0 100644 (file)
--- 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 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
                                                        *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 56811ab564c0bff15367b4d09ddae517a1e84fe7..6919bf1ff17c039b1194942a66b6ac4a26b571dc 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -15161,8 +15161,26 @@ find_name_end(arg, expr_start, expr_end, flags)
                        || *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 @@ find_name_end(arg, expr_start, expr_end, flags)
            else if (*p == ']')
                --br_nest;
        }
+
        if (br_nest == 0)
        {
            if (*p == '{')