diff --git a/src/Makefile b/src/Makefile
index 72f036b..cebbbc3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1844,8 +1844,8 @@
 # spell file is there.
 installspell: $(DEST_VIM) $(DEST_RT) $(DEST_SPELL)
 	if test -f $(SPELLSOURCE)/en.latin1.spl; then \
-	  $(INSTALL_DATA) $(SPELLSOURCE)/*.spl *.vim $(DEST_SPELL); \
-	  chmod $(HELPMOD) $(DEST_SPELL)/*.spl *.vim; \
+	  $(INSTALL_DATA) $(SPELLSOURCE)/*.spl $(SPELLSOURCE)/*.vim $(DEST_SPELL); \
+	  chmod $(HELPMOD) $(DEST_SPELL)/*.spl $(DEST_SPELL)/*.vim; \
 	fi
 
 # install helper program xxd
diff --git a/src/eval.c b/src/eval.c
index 3cb3bd7..a7fc6b3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11944,6 +11944,14 @@
     rettv->vval.v_number = lnum;
 }
 
+#ifdef HAVE_STDARG_H
+/* This dummy va_list is here because:
+ * - passing a NULL pointer doesn't work when va_list isn't a pointer
+ * - locally in the function results in a "used before set" warning
+ * - using va_start() to initialize it gives "function with fixed args" error */
+static va_list	ap;
+#endif
+
 /*
  * "printf()" function
  */
@@ -11961,10 +11969,6 @@
 	char_u	*s;
 	int	saved_did_emsg = did_emsg;
 	char	*fmt;
-	va_list	ap; /* dummy */
-
-	/* Avoid warning for "ap" used before set; it's unused. */
-	va_start(ap, rettv);
 
 	/* Get the required length, allocate the buffer and do it for real. */
 	did_emsg = FALSE;
diff --git a/src/testdir/test58.in b/src/testdir/test58.in
index 1beb457..530b27a 100644
--- a/src/testdir/test58.in
+++ b/src/testdir/test58.in
@@ -120,7 +120,7 @@
 1GyG:q
 :$put
 /^comptest:
-:for i in range(12)
+:for i in range(11)
 normal ]smm
 let str = spellbadword()
 $put =str
@@ -481,9 +481,11 @@
 wordutil wordutils wordutilize
 pro pro-ok
 bork borkbork borkborkbork borkborkborkbork borkborkborkborkbork
+borkborkborkborkborkbork
 tomato tomatotomato tomatotomatotomato
-startend endstart endend startstart
+startend endstart endend startstart wordend
 startword startwordword wordstart startwordend startwordwordend
+startwordwordwordend startwordwordwordwordend
 prebork preborkprebork preborkborkprebork preborkpreborkbork
 borkpreborkpreborkbork
 
diff --git a/src/testdir/test58.ok b/src/testdir/test58.ok
index 4a1f948..570ab7d 100644
--- a/src/testdir/test58.ok
+++ b/src/testdir/test58.ok
@@ -87,23 +87,21 @@
 ['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']
+borkborkborkborkborkbork
+['borkbork borkborkborkbork', 'borkborkbork borkborkbork', 'borkborkborkborkbork bork']
 tomatotomatotomato
-['tomatotomatotomato', 'tomato tomatotomato', 'tomatotomato tomato']
+['tomato tomatotomato', 'tomatotomato tomato', 'tomato tomato tomato']
 endstart
 ['end start', 'start']
 endend
 ['end end', 'end']
 startstart
 ['start start']
+wordend
+['word end', 'wordword', 'word']
 wordstart
 ['word start', 'bork start']
-startwordwordend
-['startwordword end', 'startwordword', 'start wordword end']
+startwordwordwordwordend
+['startwordwordwordword end', 'startwordwordwordword', 'start wordwordwordword end']
 borkpreborkpreborkbork
-['bork preborkpreborkbork', 'borkpreborkprebork bork', 'borkprebork preborkbork']
+['borkpreborkprebork bork', 'borkprebork preborkbork', 'bork preborkpreborkbork']
diff --git a/src/version.h b/src/version.h
index 336d3b2..7e4ca14 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 22)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 22, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 23)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 23, compiled "