summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-03 20:50:02 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-03 20:50:02 +0100
commit97195685334c800c5ad1328d957d1bf21f5fa1fa (patch)
treebef1163316715fafeb24976d2fc066c7d431cde7 /src
parent51a7454cd2c34ee459f104e45768eab3817c099e (diff)
downloadvim-git-97195685334c800c5ad1328d957d1bf21f5fa1fa.tar.gz
patch 8.1.0561: MSCV error format has changedv8.1.0561
Problem: MSCV error format has changed. Solution: Make the space between the line number and colon optional.
Diffstat (limited to 'src')
-rw-r--r--src/option.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.h b/src/option.h
index 5df7f2147..cb25938e7 100644
--- a/src/option.h
+++ b/src/option.h
@@ -19,7 +19,7 @@
# define DFLT_EFM "%f>%l:%c:%t:%n:%m,%f:%l: %t%*\\D%n: %m,%f %l %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f:%l:%m,%f|%l| %m"
#else
# if defined(WIN3264)
-# define DFLT_EFM "%f(%l) : %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l) : %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m"
+# define DFLT_EFM "%f(%l) \\=: %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l) \\=: %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m"
# else
# if defined(__QNX__)
# define DFLT_EFM "%f(%l):%*[^WE]%t%*\\D%n:%m,%f|%l| %m"
diff --git a/src/version.c b/src/version.c
index 355b11480..cbe4636da 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 561,
+/**/
560,
/**/
559,