diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 573cd5f..10870f7 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.1b.  Last change: 2006 Oct 02
+*diff.txt*      For Vim version 7.1.  Last change: 2006 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 684f5fe..5bc8800 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.1b.  Last change: 2006 Nov 07
+*help.txt*	For Vim version 7.1.  Last change: 2006 Nov 07
 
 			VIM - main help file
 									 k
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index 7e9cd8a..2dfe257 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.1b.  Last change: 2006 Apr 30
+*if_ruby.txt*   For Vim version 7.1.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt
index 3280e06..c2b7947 100644
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.1b.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.1.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 98650a4..a7302e9 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.1b.  Last change: 2006 Dec 07
+*motion.txt*    For Vim version 7.1.  Last change: 2006 Dec 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt
index 9299108..c222e9a 100644
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.1b.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.1.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
index c284068..c83c870 100644
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 7.1b.  Last change: 2006 Jun 14
+*pi_paren.txt*  For Vim version 7.1.  Last change: 2006 Jun 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index f990f13..0a4d845 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.1b.  Last change: 2006 Jul 24
+*tips.txt*      For Vim version 7.1.  Last change: 2006 Jul 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index e236a90..28726fa 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.1b.  Last change: 2006 Nov 05
+*usr_10.txt*	For Vim version 7.1.  Last change: 2006 Nov 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/syntax/indent.vim b/runtime/syntax/indent.vim
index 359a724..4934d01 100644
--- a/runtime/syntax/indent.vim
+++ b/runtime/syntax/indent.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         indent(1) configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2007-05-07
+" Latest Revision:  2007-05-10
 "   indent_is_bsd:  If exists, will change somewhat to match BSD implementation
 "
 " TODO: is the deny-all (a la lilo.vim nice or no?)...
@@ -26,17 +26,17 @@
 syn region  indentComment start='//' skip='\\$' end='$'
                           \ contains=indentTodo,@Spell
 
-syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
-                        \ nextgroup=indentNumber skipwhite skipnl
 if !exists("indent_is_bsd")
   syn match indentOptions '-i\|--indentation-level'
-                        \ nextgroup=indentNumber skipwhite skipnl
+                        \ nextgroup=indentNumber skipwhite skipempty
 endif
+syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
+                        \ nextgroup=indentNumber skipwhite skipempty
 
 syn match   indentNumber  display contained '\d\+\>'
 
 syn match   indentOptions '-T'
-                        \ nextgroup=indentIdent skipwhite skipnl
+                        \ nextgroup=indentIdent skipwhite skipempty
 
 syn match   indentIdent   display contained '\h\w*\>'
 
@@ -125,7 +125,7 @@
                         \ -version --version
 
 if exists("indent_is_bsd")
-  syn keyword indentOptions -ip -nip -dj -ndj -ei -nei
+  syn keyword indentOptions -ip -ei -nei
 endif
 
 if exists("c_minlines")