updated for version 7.4.340

Problem:    Error from sed about illegal bytes when installing Vim.
Solution:   Prepend LC_ALL=C. (Itchyny)

diff --git a/src/installman.sh b/src/installman.sh
index dd04e2f816dcd48debed749a54d2dc759419deaa..0ac6c46a141a4c43a6d586c3739ef832d02018da 100755 (executable)
--- 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 8568a363c50eef19351f0a305ffa25d3cc0119b7..4b4f826f371798e8a39e07856b96bb80168fafe2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    340,
 /**/
     339,
 /**/