# HG changeset patch # User Bram Moolenaar # Date 1608723907 -3600 # Node ID 194e1fe0855439f1ef97f14d4b7ada5d1016c3ab # Parent 82c2b15b91329e01c73be63c6234f750533ec3f4 patch 8.2.2196: :version output has extra spaces in compile and link command Commit: https://github.com/vim/vim/commit/abcbb0e9ad43fc25077e1681528e72ddcbeed300 Author: Bram Moolenaar Date: Wed Dec 23 12:33:42 2020 +0100 patch 8.2.2196: :version output has extra spaces in compile and link command Problem: :version output has extra spaces in compile and link command. Solution: Adjust QUOTESED. (closes https://github.com/vim/vim/issues/7505) diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -5006,9 +5006,9 @@ esac fi if test "$zOSUnix" = "yes"; then - QUOTESED="sed -e 's/[\\\\\"]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/'" -else - QUOTESED="sed -e 's/[\\\\\"]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/'" + QUOTESED="sed -e 's/[\\\\\"]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/' -e 's/ */ /g'" +else + QUOTESED="sed -e 's/[\\\\\"]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/' -e 's/ */ /g'" fi diff --git a/src/configure.ac b/src/configure.ac --- a/src/configure.ac +++ b/src/configure.ac @@ -437,9 +437,9 @@ fi dnl Set QUOTESED. Needs additional backslashes on zOS if test "$zOSUnix" = "yes"; then - QUOTESED="sed -e 's/[[\\\\\"]]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/'" + QUOTESED="sed -e 's/[[\\\\\"]]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/' -e 's/ */ /g'" else - QUOTESED="sed -e 's/[[\\\\\"]]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/'" + QUOTESED="sed -e 's/[[\\\\\"]]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/' -e 's/ */ /g'" fi AC_SUBST(QUOTESED) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2196, +/**/ 2195, /**/ 2194,