diff options
| -rw-r--r-- | README_amibin.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/diff.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/help.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/if_ruby.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/if_sniff.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/motion.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/os_msdos.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/pi_paren.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/tips.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/usr_10.txt | 2 | ||||
| -rw-r--r-- | runtime/syntax/indent.vim | 12 | ||||
| -rwxr-xr-x | src/auto/configure | 4 |
12 files changed, 18 insertions, 18 deletions
diff --git a/README_amibin.txt b/README_amibin.txt index 3c61bee6e..8f2b2d40a 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 573cd5f58..10870f76f 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 684f5fe45..5bc8800e0 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 7e9cd8a17..2dfe2572e 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 3280e0646..c2b794704 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 98650a4f1..a7302e928 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 9299108fc..c222e9a59 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 c28406810..c83c8703d 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 f990f13b6..0a4d845eb 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 e236a909f..28726fa74 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 359a724a2..4934d018e 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 5a55df969..f976f51fc 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 && |