diff --git a/README_amibin.txt b/README_amibin.txt
index 3c61bee6e200c89d669575992ae165af9f5fa761..8f2b2d40a93fb5e8298c171977df01eae0e0d632 100644
--- a/README_amibin.txt
+++ b/README_amibin.txt
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.1b of Vim: Vi IMproved.
+README_amibin.txt for version 7.1 of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 573cd5f587d35423ecf06e9a02218cb84aa8e772..10870f76f26baaf806b67935fda9e194b1160cf9 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 684f5fe45591168fda852ece1386b05b5ab8747a..5bc8800e07bc6be9ad05951b8ac405c1f80d6b13 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 7e9cd8a1790ea9e759217a5a77b8842ef7ec83b1..2dfe2572e5982f95e0386bd2813a0826f0ba6746 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 3280e0646aa5c8b8df92770b9f8fc8bd03311241..c2b794704ab5c71329a6dba900a3e685da5a15f8 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 98650a4f134bd859d2174358938ceba0042b08eb..a7302e928545959fd16eaa2eba0ee8a2ef5916cb 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 9299108fcaa90181df55172863040b8efca6faa4..c222e9a5942360338de18751309534ecf8ddd7ee 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 c28406810d1af861eb73f29473a3232f27254c48..c83c8703db5378824f0a9eef40e145f1cf34eb04 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 f990f13b6b05ea1688a9733d1a3b70bbdf4093aa..0a4d845eb9ee3575a00741b3719c8982f9961023 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 e236a909fb7f0ba1b422fe456747e9efcaec2647..28726fa745401b87ba7d40a0505e5780929f909c 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 359a724a29a58d6c48ec2bb5f41855904802020e..4934d018e719ac148b5af5975711c26e19ba22c4 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='/\*' end='\*/'
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 @@ syn keyword indentOptions -bacc --blank-lines-after-ifdefs
\ -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")
diff --git a/src/auto/configure b/src/auto/configure
index 5a55df96974f3c4df91e78cd7003daa7070820a8..f976f51fc8515e47945473226ae9d2c67dcf7e64 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -3844,9 +3844,9 @@ echo "${ECHO_T}\"no\"" >&6
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
- MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a ${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
else
- MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme"
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
if test "$GCC" = yes; then
MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
elif test "`(uname) 2>/dev/null`" = SunOS &&