updated for version 7.0104

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 61535c70fc9bf0117d376051658bb4ba98174b37..d4c6a8c5b987aa59c801a3517c6abe8d12f80a50 100644 (file)
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Jul 01
+" Last Change: 2005 Jul 06
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -395,6 +395,9 @@ if has("syntax")
   call append("$", "spellfile\tfile that \"zg\" adds good words to")
   call append("$", "\t(local to buffer)")
   call <SID>OptionL("spf")
+  call append("$", "spellcapcheck\tpattern to locate the end of a sentence")
+  call append("$", "\t(local to buffer)")
+  call <SID>OptionL("spc")
   call append("$", "spellsuggest\tmethods used to suggest corrections")
   call <SID>OptionG("sps", &sps)
 endif
@@ -989,6 +992,8 @@ call append("$", "shellcmdflag\targument for 'shell' to execute a command")
 call <SID>OptionG("shcf", &shcf)
 call append("$", "shellredir\tused to redirect command output to a file")
 call <SID>OptionG("srr", &srr)
+call append("$", "shelltemp\tuse a temp file for shell commands instead of using a pipe")
+call <SID>BinOptionG("stmp", &stmp)
 call append("$", "equalprg\tprogram used for \"=\" command")
 call append("$", "\t(global or local to buffer)")
 call <SID>OptionG("ep", &ep)

diff --git a/src/spell.c b/src/spell.c
index 94991e734ee638cad36e27d33a350c6180eb5f83..175cf0bffda176a220bf404bdc185772e0c96eee 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -4107,7 +4107,8 @@ store_aff_word(word, spin, afflist, affile, ht, xht, comb, flags, pfxlist)
                        use_pfxlist = pfxlist;
 
                        /* When there are postponed prefixes... */
-                       if (spin->si_prefroot != NULL)
+                       if (spin->si_prefroot != NULL
+                               && spin->si_prefroot->wn_sibling != NULL)
                        {
                            /* ... add a flag to indicate an affix was used. */
                            use_flags |= WF_HAS_AFF;