diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 99c2e4a01fca5c3552efdfd06151387ba3541816..bfad4ca4cf5b6bba6a940669fe3bbc147896d994 100644
--- 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
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index b8b04403a075f80e75547a3ad49c3cc40e7bbb42..87f2c25c1e7490c887443a30a1deeedb7247026a 100644
--- 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
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
index 11963557714f5f0d7e98656355a69c25ea6d8771..8035fc4264a5cc48b1983fb55c10cf27c6bd0e92 100644
--- 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
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index e1f65858d5bfaf952bdde6b4feb5331aa0b5f708..413143a38dce5f898177d8d358a96ad44790def9 100644
--- 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
diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt
index c2159714afd641b98dc6a51cb659c9fb9abfc2ed..94afd80840d3269677576d659a8f0ed8628a1781 100644
--- 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
diff --git a/runtime/indent/eterm.vim b/runtime/indent/eterm.vim
index 7424d917cfb876f39bdfed0e1607f1ccd63d8fcd..f25f5f4dade860c1e8bae3d7b3db707571050cff 100644
--- 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
diff --git a/src/VisVim/OleAut.cpp b/src/VisVim/OleAut.cpp
index 0e01b1ec166520f71d58dcc9763b686fa38c75fc..f96b03d6ebcf326d0d4201d0a69f75334ba4bf87 100644
--- 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::GetDispatchId (char* Name)
// 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
diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c
index 4a5edf1b8123c3c06bca9b34288211845f35bfbe..a19d69a12204b545df05c8520210501e6eabc464 100644
--- 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"
diff --git a/src/gui_motif.c b/src/gui_motif.c
index e29dd2a381915cc68714cae627df85e461523da4..87a8e424dc9d84d17cf460af8114211a62f92cb2 100644
--- 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, args, arg)
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.
*/