# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1590516904 -7200
# Node ID 6564dafe500574070bfedf0aff3bee118dbc1860
# Parent  5e6b9042a77508df30a208a987b2c9bb90300e3d
patch 8.2.0828: Travis: regexp patttern doesn't work everywhere

Commit: https://github.com/vim/vim/commit/92c098d18e435a7a762409744ebe2dbb3746ed77
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue May 26 20:09:11 2020 +0200

    patch 8.2.0828: Travis: regexp patttern doesn't work everywhere

    Problem:    Travis: regexp patttern doesn't work everywhere.
    Solution:   Use [:blank:] instead of \b. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/6146)

diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,7 +125,12 @@ script:
       # Append various warning flags to CFLAGS.
       # BSD sed needs backup extension specified.
       sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
-      sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
+      if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then
+        # On macOS, the entity of gcc is clang.
+        sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
+      else
+        sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
+      fi
       make ${SHADOWOPT} -j${NPROC}
     fi
   - echo -en "travis_fold:end:build\\r\\033[0K"
@@ -141,11 +146,10 @@ script:
   - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
   - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
 
-
-# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
-# exclude some builds on mac os x and linux
-# on mac os x "tiny" is always without GUI
-# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
+# Instead of using all environments with both compilers on both systems,
+# exclude some builds on mac os x and linux.
+# On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments.
+# Linux: 2 compilers on some of the environments + gcc on os390
 jobs:
   include:
     - <<: *osx
diff --git a/ci/config.mk.clang.sed b/ci/config.mk.clang.sed
--- a/ci/config.mk.clang.sed
+++ b/ci/config.mk.clang.sed
@@ -1,1 +1,2 @@
-/^RUBY_CFLAGS\b/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
+/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
diff --git a/ci/config.mk.gcc.sed b/ci/config.mk.gcc.sed
--- a/ci/config.mk.gcc.sed
+++ b/ci/config.mk.gcc.sed
@@ -1,1 +1,1 @@
-/^CFLAGS\b/s/$/ -Wno-error=maybe-uninitialized/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/
diff --git a/ci/config.mk.sed b/ci/config.mk.sed
--- a/ci/config.mk.sed
+++ b/ci/config.mk.sed
@@ -1,2 +1,2 @@
-/^CFLAGS\b/s/$/ -Wall -Wextra -Wshadow -Werror/
-/^PERL_CFLAGS\b/s/$/ -Wno-error=unused-function/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
+/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/
diff --git a/src/if_ruby.c b/src/if_ruby.c
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -100,7 +100,8 @@
 #endif
 
 // On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it
-// conflicts with the definition in config.h then causes macro-redifned warning.
+// conflicts with the definition in config.h then causes a macro-redefined
+// warning.
 #ifdef SIZEOF_TIME_T
 # undef SIZEOF_TIME_T
 #endif
@@ -113,6 +114,11 @@
 # include <st.h>  // for ST_STOP and ST_CONTINUE
 #endif
 
+// See above.
+#ifdef SIZEOF_TIME_T
+# undef SIZEOF_TIME_T
+#endif
+
 #undef off_t	// ruby defines off_t as _int64, Mingw uses long
 #undef EXTERN
 #undef _
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    828,
+/**/
     827,
 /**/
     826,