updated for version 7.0133

9 files changed, 77 insertions, 24 deletions

diff --git a/Filelist b/Filelist
index 7579088158..738dd9e2af 100644
--- a/Filelist
+++ b/Filelist
@@ -690,6 +690,8 @@ LANG_GEN = \
 		runtime/spell/??/main.aap \
 		runtime/spell/yi/README.txt \
 		runtime/spell/main.aap \
+		runtime/spell/*.vim \
+		runtime/spell/fixdup \
 
 # generic language files, binary
 LANG_GEN_BIN = \
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 56a91b6af7..802ae999c7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 18
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1984,9 +1984,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-\*
 		\	Backslash in a [] range in a search pattern is taken
 			literally, only "\]" is special  See |/[]|
-			   'l' included: "/[ \t]"  finds <Space>, '\' and 't'
-			   'l' excluded: "/[ \t]"  finds <Space> and <Tab>
-			Also see |cpo-\|.
+			   '\' included: "/[ \-]"  finds <Space>, '\' and '-'
+			   '\' excluded: "/[ \-]"  finds <Space> and '-'
+			Also see |cpo-l|.
 								*cpo-/*
 		/	When "%" is used as the replacement string in a |:s|
 			command, use the previous replacement string. |:s%|
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 2ec2eba36f..f49abd300e 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 19
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -124,19 +124,25 @@ z?			For the word under/after the cursor suggest correctly
 			e.g., when the word after it is bad.
 			The results are sorted on similarity to the word
 			under/after the cursor.
-			This may take a long time.  Hit CTRL-C when you are
+			This may take a long time.  Hit CTRL-C when you get
 			bored.
-			This does not work when there is a line break halfway
-			a bad word (e.g., "the the").
-			You can enter the number of your choice or press
-			<Enter> if you don't want to replace.  You can also
-			use the mouse to click on your choice (only works if
-			the mouse can be used in Normal mode and when there
-			are no line wraps).  Click on the first (header) line
-			to cancel.
-			If 'verbose' is non-zero a score will be displayed to
-			indicate the likeliness to the badly spelled word (the
-			higher the score the more different).
+
+			If the command is used without a count the
+			alternatives are listed and you can enter the number
+			of your choice or press <Enter> if you don't want to
+			replace.  You can also use the mouse to click on your
+			choice (only works if the mouse can be used in Normal
+			mode and when there are no line wraps).  Click on the
+			first line (the header) to cancel.
+
+			If a count is used that suggestion is used, without
+			prompting.  For example, "1z?" always takes the first
+			suggestion.
+
+			If 'verbose' is non-zero a score will be displayed
+			with the suggestions to indicate the likeliness to the
+			badly spelled word (the higher the score the more
+			different).
 			When a word was replaced the redo command "." will
 			repeat the word replacement.  This works like "ciw",
 			the good word and <Esc>.
@@ -773,8 +779,8 @@ marked as rare.
 
 							*spell-affix-nocomp*
 Another extra item for Vim is the "nocomp" flag.  It must come after the other
-fields, before a comment.  It can be either before or after "rare".  When used
-then all words that use the affix will not be used for compound words.
+fields, before a comment.  It can be either before or after "rare".  When
+present then all words that use the affix will not be part of a compound word.
 Example:
 	affix file:
 		COMPOUNDFLAG c ~
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index 60350426b9..03820d56fc 100644
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
diff --git a/runtime/spell/he.vim b/runtime/spell/he.vim
new file mode 100644
index 0000000000..76f52c4202
--- /dev/null
+++ b/runtime/spell/he.vim
@@ -0,0 +1,10 @@
+" For Hebrew capitals should not be checked.  But only change the
+" 'spellcapcheck' option when it is not at its default value.
+let s:spc = &l:spc
+setlocal spc&
+if s:spc == &l:spc
+  setlocal spc=
+else
+  let &l:spc = s:spc
+endif
+unlet s:spc
diff --git a/runtime/spell/yi/yi.diff b/runtime/spell/yi/yi.diff
index 45a2d90b07..6db3f0104e 100644
--- a/runtime/spell/yi/yi.diff
+++ b/runtime/spell/yi/yi.diff
@@ -6,7 +6,7 @@
 + 999999
   גרונטעלעמענט
   דזשאָבענדיקס
-*** /dev/null	Tue Aug 16 10:44:00 2005
+*** /dev/null	Fri Aug 19 23:01:14 2005
 --- yi.aff	Mon Aug 15 23:06:00 2005
 ***************
 *** 0 ****
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index 46ac575d01..3c4c798551 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -5,14 +5,14 @@ void spell_cat_line __ARGS((char_u *buf, char_u *line, int maxlen));
 char_u *did_set_spelllang __ARGS((buf_T *buf));
 void spell_free_all __ARGS((void));
 void spell_reload __ARGS((void));
+int spell_check_msm __ARGS((void));
 void put_bytes __ARGS((FILE *fd, long_u nr, int len));
 void ex_mkspell __ARGS((exarg_T *eap));
 void ex_spell __ARGS((exarg_T *eap));
 void spell_add_word __ARGS((char_u *word, int len, int bad, int index));
 void init_spell_chartab __ARGS((void));
 int spell_check_sps __ARGS((void));
-int spell_check_msm __ARGS((void));
-void spell_suggest __ARGS((void));
+void spell_suggest __ARGS((int count));
 void ex_spellrepall __ARGS((exarg_T *eap));
 void spell_suggest_list __ARGS((garray_T *gap, char_u *word, int maxcount, int need_cap));
 char_u *eval_soundfold __ARGS((char_u *word));
diff --git a/src/testdir/test58.ok b/src/testdir/test58.ok
index 186b256668..4a1f94835a 100644
--- a/src/testdir/test58.ok
+++ b/src/testdir/test58.ok
@@ -72,3 +72,38 @@ test
 ['test', 'Test']
 d��l
 ['deol', 'd��r']
+# file: Xtest.latin1.spl
+bork
+prebork
+end
+pro-ok
+start
+tomato
+util
+utilize
+utils
+word
+wordutilize
+['word utilize', 'wordutils', 'wordutil']
+pro
+['bork', 'end', 'word']
+borkborkborkbork
+['borkbork borkbork', 'borkborkbork bork', 'bork borkborkbork']
+borkborkborkborkbork
+['borkbork borkborkbork', 'borkborkbork borkbork', 'bork borkborkbork bork']
+tomatotomato
+['tomatotomato', 'tomato tomato']
+tomatotomatotomato
+['tomatotomatotomato', 'tomato tomatotomato', 'tomatotomato tomato']
+endstart
+['end start', 'start']
+endend
+['end end', 'end']
+startstart
+['start start']
+wordstart
+['word start', 'bork start']
+startwordwordend
+['startwordword end', 'startwordword', 'start wordword end']
+borkpreborkpreborkbork
+['bork preborkpreborkbork', 'borkpreborkprebork bork', 'borkprebork preborkbork']
diff --git a/src/version.h b/src/version.h
index 7a328452e9..336d3b2709 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 19)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 19, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 22)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 22, compiled "