summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-23 12:33:42 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-23 12:33:42 +0100
commitabcbb0e9ad43fc25077e1681528e72ddcbeed300 (patch)
tree7eee7ed7987bae4ae6697accbafdd2bb5218795c
parent1dcf55d4f1aa34b6d22001038d43f3e46407fa2e (diff)
downloadvim-git-abcbb0e9ad43fc25077e1681528e72ddcbeed300.tar.gz
patch 8.2.2196: :version output has extra spaces in compile and link commandv8.2.2196
Problem: :version output has extra spaces in compile and link command. Solution: Adjust QUOTESED. (closes #7505)
-rwxr-xr-xsrc/auto/configure4
-rw-r--r--src/configure.ac4
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 0de0ea5b7..f2486e9c4 100755
--- 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/\\\\\\\\\";\$\$/\";/'"
+ 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
diff --git a/src/configure.ac b/src/configure.ac
index 22c280d41..c024f6521 100644
--- 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
index 45b69bd31..435f3b8c5 100644
--- 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,