commit abcbb0e9ad43fc25077e1681528e72ddcbeed300
author Bram Moolenaar <Bram@vim.org> Wed Dec 23 12:33:42 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 23 12:33:42 2020 +0100
tree 7eee7ed7987bae4ae6697accbafdd2bb5218795c
parent 1dcf55d4f1aa34b6d22001038d43f3e46407fa2e

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 #7505)

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index 0de0ea5..f2486e9 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5006,9 +5006,9 @@
 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
 
 

src/configure.ac

diff --git a/src/configure.ac b/src/configure.ac
index 22c280d..c024f65 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -437,9 +437,9 @@
 
 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)
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 45b69bd..435f3b8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2196,
+/**/
     2195,
 /**/
     2194,