diff options
| -rw-r--r-- | runtime/autoload/zip.vim | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/version.h | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 45aa3532a..99bdd7960 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -76,7 +76,7 @@ fun! zip#Browse(zipfile) $ " call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'") - exe "silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'" + exe "silent r! unzip -l ".escape(a:zipfile,s:zipfile_escape) $d silent 4,$v/^\s\+\d\+\s\{0,5}\d/d silent 4,$s/^\%(.*\)\s\+\(\S\)/\1/ @@ -141,7 +141,7 @@ fun! zip#Read(fname,mode) " call Decho("zipfile<".zipfile."> fname<".fname.">") " call Decho("exe r! unzip -p '".escape(zipfile,s:zipfile_escape)."' ".fname) - exe "r! unzip -p '".escape(zipfile,s:zipfile_escape)."' ".fname + exe "r! unzip -p ".escape(zipfile,s:zipfile_escape)." ".fname " cleanup 0d diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 801311a03..1bb6ff1d5 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0b. Last change: 2006 Mar 18 +*options.txt* For Vim version 7.0b. Last change: 2006 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1222,6 +1222,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'casemap' 'cmp' string (default: "internal,keepascii") global {not in Vi} + {only available when compiled with the |+multi_byte| + feature} Specifies details about changing the case of letters. It may contain these words, separated by a comma: internal Use internal case mapping functions, the current diff --git a/src/auto/configure b/src/auto/configure index 20668eb29..22f724eaa 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -2781,7 +2781,7 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([0-9]\.[0-9.]*\).*$/\2/g'` + gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` @@ -15249,7 +15249,7 @@ echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6 DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([1-9]\)\.[0-9].*$/\2/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" fi diff --git a/src/configure.in b/src/configure.in index aae20b915..f7648a882 100644 --- a/src/configure.in +++ b/src/configure.in @@ -29,7 +29,7 @@ if test -z "$CFLAGS"; then test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" fi if test "$GCC" = yes; then - gccversion=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[0-9]]\.[[0-9.]]*\).*$/\2/g'` + gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"' @@ -2834,7 +2834,7 @@ dnl the number before the version number. AC_MSG_CHECKING(for GCC 3 or later) DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - gccmajor=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[1-9]]\)\.[[0-9]].*$/\2/g'` + gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" fi diff --git a/src/version.h b/src/version.h index cef085197..d8cde672c 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70b" #define VIM_VERSION_SHORT "7.0b" #define VIM_VERSION_MEDIUM "7.0b BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0b BETA (2006 Mar 24)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0b BETA (2006 Mar 24, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0b BETA (2006 Mar 25)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0b BETA (2006 Mar 25, compiled " |