--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.1a.  Last change: 2006 Mar 29
+*fold.txt*      For Vim version 7.1b.  Last change: 2006 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.1a.  Last change: 2005 Mar 29
+*if_cscop.txt*  For Vim version 7.1b.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn

--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.1a.  Last change: 2005 Mar 29
+*os_390.txt*    For Vim version 7.1b.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl

--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.1a.  Last change: 2006 Apr 30
+*undo.txt*      For Vim version 7.1b.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 7.1a.  Last change: 2006 Apr 24
+*usr_26.txt*	For Vim version 7.1b.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

--- a/runtime/indent/eterm.vim
+++ b/runtime/indent/eterm.vim
@@ -1,7 +1,7 @@
 " Vim indent file
-" Language:	    Eterm configuration file
+" Language:         Eterm configuration file
 " 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=GetEtermIndent()
 setlocal indentkeys=!^F,o,O,=end
+setlocal nosmartindent
 
 if exists("*GetEtermIndent")
   finish

--- a/src/VisVim/OleAut.cpp
+++ b/src/VisVim/OleAut.cpp
@@ -111,7 +111,7 @@ error:
 
 // Return the dispatch id of a named service
 // This id can be used in subsequent calls to GetProperty (), SetProperty () and
-// Method (). This is the prefered method when performance is important.
+// Method (). This is the preferred method when performance is important.
 //
 DISPID COleAutomationControl::GetDispatchId (char* Name)
 {
@@ -135,7 +135,7 @@ DISPID COleAutomationControl::GetDispatc
 //  Name      Name of property or method.
 //
 //  Format    Format string that describes the variable list of parameters that
-//	      follows. The format string can contain the follwoing characters.
+//	      follows. The format string can contain the following characters.
 //	      & = mark the following format character as VT_BYREF
 //	      B = VT_BOOL
 //	      i = VT_I2

--- a/src/gui_gtk_f.c
+++ b/src/gui_gtk_f.c
@@ -15,9 +15,10 @@
  * (C) 2002,2003  Jason Hildebrand  <jason@peaceworks.ca>
  *		  Daniel Elstner  <daniel.elstner@gmx.net>
  *
- * This is a special purspose container widget, which manages arbitrary childs
- * at arbitrary positions width arbitrary sizes.  This finally puts an end on
- * our resizement problems with which we where struggling for such a long time.
+ * This is a special purpose container widget, which manages arbitrary
+ * children at arbitrary positions width arbitrary sizes.  This finally puts
+ * an end on our resize problems with which we where struggling for such a
+ * long time.
  */
 
 #include "vim.h"

--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1043,7 +1043,7 @@ gui_motif_add_actext(menu)
 {
     XmString	label;
 
-    /* Add accelrator text, if there is one */
+    /* Add accelerator text, if there is one */
     if (menu->actext != NULL && menu->id != (Widget)0)
     {
 	label = XmStringCreate((char *)menu->actext, STRING_TAG);
@@ -2531,7 +2531,7 @@ create_pixmap_label(parent, name, data, 
     label = XmCreateLabelGadget(parent, name, args, arg);
 
     /*
-     * We need to be carefull here, since in case of gadgets, there is
+     * We need to be careful here, since in case of gadgets, there is
      * no way to get the background color directly from the widget itself.
      * In such cases we get it from The Core part of his parent instead.
      */