diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-25 15:02:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-25 15:02:33 +0200 |
| commit | 72e8f0bcc1311aaec8949ddd9c0d0515c03ca3e0 (patch) | |
| tree | 79bad3d29b2efde0eae820435dc43326af750fc1 | |
| parent | 8dc907d7d30c9f60f14f197e99f2f62001dd09f0 (diff) | |
| download | vim-git-72e8f0bcc1311aaec8949ddd9c0d0515c03ca3e0.tar.gz | |
updated for version 7.4.340v7.4.340
Problem: Error from sed about illegal bytes when installing Vim.
Solution: Prepend LC_ALL=C. (Itchyny)
| -rwxr-xr-x | src/installman.sh | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/installman.sh b/src/installman.sh index dd04e2f81..0ac6c46a1 100755 --- a/src/installman.sh +++ b/src/installman.sh @@ -43,10 +43,13 @@ if test $what = "install" -o $what = "xxd"; then fi fi +# Note: setting LC_ALL to C is required to avoid illegal byte errors from sed +# on some systems. + if test $what = "install"; then # vim.1 echo installing $destdir/$exename.1 - sed -e s+/usr/local/lib/vim+$vimloc+ \ + LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ -e s+$vimloc/doc+$helpsubloc+ \ -e s+$vimloc/print+$printsubloc+ \ -e s+$vimloc/syntax+$synsubloc+ \ @@ -64,7 +67,7 @@ if test $what = "install"; then # vimtutor.1 echo installing $destdir/$exename""tutor.1 - sed -e s+/usr/local/lib/vim+$vimloc+ \ + LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ -e s+$vimloc/tutor+$tutorsubloc+ \ $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1 chmod $manmod $destdir/$exename""tutor.1 @@ -76,7 +79,7 @@ if test $what = "install"; then # evim.1 echo installing $destdir/$evimname.1 - sed -e s+/usr/local/lib/vim+$vimloc+ \ + LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \ $helpsource/evim$langadd.1 > $destdir/$evimname.1 chmod $manmod $destdir/$evimname.1 diff --git a/src/version.c b/src/version.c index 8568a363c..4b4f826f3 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 340, +/**/ 339, /**/ 338, |