summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2022-05-02 10:34:15 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-02 10:34:15 +0100
commit2890c0b9d2416489d48bc47567378503997fef84 (patch)
treefe69099aebb8e6cd82d2dbdc937b32c887f75d8e
parent2096a5f128029b1156a035a27c988995db240cea (diff)
downloadvim-git-8.2.4856.tar.gz
patch 8.2.4856: MinGW compiler complains about unknown escape sequencev8.2.4856
Problem: MinGW compiler complains about unknown escape sequence. Solution: Avoid using a backslash in path. (Christian Brabandt, closes #10337)
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc2816c39..438bfd9ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -364,6 +364,8 @@ jobs:
LUA32_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win32_dllw6_lib.zip
LUA64_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win64_dllw6_lib.zip
LUA_DIR: D:\Lua
+ # do not want \L to end up in pathdef.c and compiler complaining about unknown escape sequences \l
+ LUA_DIR_SLASH: D:/Lua
# Python 2
PYTHON_VER: 27
PYTHON_VER_DOT: '2.7'
@@ -510,7 +512,7 @@ jobs:
mingw32-make -f Make_ming.mak -j2 \
FEATURES=${{ matrix.features }} \
GUI=yes IME=yes ICONV=yes VIMDLL=yes \
- DYNAMIC_LUA=yes LUA=${LUA_DIR} \
+ DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
diff --git a/src/version.c b/src/version.c
index b10da4566..fac7af981 100644
--- 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 */
/**/
+ 4856,
+/**/
4855,
/**/
4854,