diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim
index e6fe2b554d61c1b93bda7a6f96cc2a773e21caf1..f936c9b2f60554da425cdcbdc150f3565ce56ee7 100644
--- a/runtime/indent/rst.vim
+++ b/runtime/indent/rst.vim
@@ -1,7 +1,7 @@
 " Vim indent file
-" Language:	    reStructuredText Documentation Format
+" Language:         reStructuredText Documentation Format
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Latest Revision:  2006-12-20
 
 if exists("b:did_indent")
   finish
@@ -10,6 +10,7 @@ let b:did_indent = 1
 
 setlocal indentexpr=GetRSTIndent()
 setlocal indentkeys=!^F,o,O
+setlocal nosmartindent
 
 if exists("*GetRSTIndent")
   finish
@@ -40,7 +41,7 @@ function GetRSTIndent()
       let ind = ind - 2
     elseif line =~ '^\s*\d\+\.\s'
       let ind = ind - matchend(substitute(line, '^\s*', '', ''),
-	    \ '\d\+\.\s\+')
+            \ '\d\+\.\s\+')
     elseif line =~ '^\s*\.\.'
       let ind = ind - 3
     else
diff --git a/runtime/indent/yacc.vim b/runtime/indent/yacc.vim
index 597a2cc83a3032073ec1c8a7869da3f958e54ebb..2ab7d7b38ccdf18fce12df556f9f40f5ee58d4b1 100644
--- a/runtime/indent/yacc.vim
+++ b/runtime/indent/yacc.vim
@@ -1,7 +1,7 @@
 " Vim indent file
-" Language:	    YACC input file
+" Language:         YACC input file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Latest Revision:  2006-12-20
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -12,6 +12,7 @@ let b:did_indent = 1
 
 setlocal indentexpr=GetYaccIndent()
 setlocal indentkeys=!^F,o,O
+setlocal nosmartindent
 
 " Only define the function once.
 if exists("*GetYaccIndent")
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index bdf0c0943621a5f2fe9e87d7fec6fac043dd707d..d24b79024a5a7fd317bcf0e8f2974e199b4b3bfd 100644
Binary files a/runtime/spell/en.latin1.spl and b/runtime/spell/en.latin1.spl differ
diff --git a/src/structs.h b/src/structs.h
index 64bbb96bc06db1b408d8a27ced97f8c49e027184..d531f4e35bb7ed0b68ab72f0cefae0a5527463f5 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -265,7 +265,7 @@ typedef struct
 } visualinfo_T;
 
 /*
- * stuctures used for undo
+ * structures used for undo
  */
 
 typedef struct u_entry u_entry_T;
@@ -307,7 +307,7 @@ struct u_header
 #define UH_EMPTYBUF 0x02	/* buffer was empty */
 
 /*
- * stuctures used in undo.c
+ * structures used in undo.c
  */
 #if SIZEOF_INT > 2
 # define ALIGN_LONG	/* longword alignment and use filler byte */
@@ -1946,7 +1946,7 @@ struct window_S
      * entry 2: newest
      */
     taggy_T	w_tagstack[TAGSTACKSIZE];	/* the tag stack */
-    int		w_tagstackidx;		/* idx just below activ entry */
+    int		w_tagstackidx;		/* idx just below active entry */
     int		w_tagstacklen;		/* number of tags on stack */
 
     /*