- patchlevel 946

.gitignore

@@ -99,3 +99,4 @@
 /vim-8.0-895.tar.bz2
 /vim-8.0-896.tar.bz2
 /vim-8.0-938.tar.bz2
+/vim-8.0-946.tar.bz2

README.patches

@@ -1,3 +1,78 @@
+commit a9f8ee05f46f2d6621a3719cd15150155d33eed4
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 23:40:45 2017 +0200
+
+    patch 8.0.0946: using PATH_MAX does not work well on some systems
+    
+    Problem:    Using PATH_MAX does not work well on some systems.
+    Solution:   use MAXPATHL instead. (James McCoy, closes #1973)
+
+commit 60104f183cc639d2a5295ba157d4ec66ac19fa53
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 23:25:04 2017 +0200
+
+    patch 8.0.0945: 64-bit compiler warnings
+    
+    Problem:    64-bit compiler warnings.
+    Solution:   Use "size_t" instead of "int". (Mike Williams)
+
+commit d21b16f3c0c676bfe3a37aef1ac3118e1ecded60
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 23:13:30 2017 +0200
+
+    patch 8.0.0944: test_profile is a little bit flaky
+    
+    Problem:    Test_profile is a little bit flaky.
+    Solution:   Accept a match when self and total time are the same. (James
+                McCoy, closes #1972)
+
+commit 3678393baa2fbfcd5020fcf0ac12947fc485e912
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 23:07:30 2017 +0200
+
+    patch 8.0.0943: MS-Windows: Test_terminal_scrape_multibyte may fail
+    
+    Problem:    Test_terminal_scrape_multibyte fails if the codepage is not utf-8.
+    Solution:   Start "cmd" with the utf-8 codepage. (micbou, closes #1975)
+
+commit 4fa1019f8026cb383423fb4086cba7e308591e18
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 22:56:27 2017 +0200
+
+    patch 8.0.0942: using freed memory with ":terminal"
+    
+    Problem:    Using freed memory with ":terminal" if an autocommand changes
+                'shell' when splitting the window. (Marius Gedminas)
+    Solution:   Make a copy of 'shell'. (closes #1974)
+
+commit 05fbfdcda48a564e7a778c67251f732481f3ceaa
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 22:35:08 2017 +0200
+
+    patch 8.0.0941: existing color schemes don't like StatusLineTerm
+    
+    Problem:    Existing color schemes don't work well with StatusLineTerm.
+    Solution:   Don't use "reverse", use fg and bg colors.  Also add
+                StatusLineTermNC.
+
+commit c08706135d006453784f85d211c76e27b4f2a6d0
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 22:01:16 2017 +0200
+
+    patch 8.0.0940: Test_terminal_scrape_multibyte is flaky
+    
+    Problem:    Test_terminal_scrape_multibyte is flaky. (James McCoy)
+    Solution:   Use WaitFor() instead of term_wait().
+
+commit 51c23687a9298c27d41ad9780b032f434e1e1646
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 14 21:45:00 2017 +0200
+
+    patch 8.0.0939: Test_terminal_env is flaky
+    
+    Problem:    Test_terminal_env is flaky. (James McCoy)
+    Solution:   Use WaitFor() instead of term_wait().
+
 commit 6bb18a878cc4cc79cdca4b7497367e59a90125e7
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Aug 13 22:14:17 2017 +0200

sources

@@ -1 +1 @@
-SHA512 (vim-8.0-938.tar.bz2) = 60134cbf0001ec8e178e207ace3bb9d6e56aa99d618a6e7e4e422ce271498f96500c6fc6486cdc7c277a79af50d5435603b11ddab6e7f0fc689d6fb2a9883366
+SHA512 (vim-8.0-946.tar.bz2) = 9e43a040f4fd858baaa2ffcdd8ea1dda6aa2bb8dfef8bf29d3be9ca443f1aa38fa381570ef7b8c3d0f2b8902b441d90cc12e2ac12ad7ee07deb5dc88effddab3

vim-7.4-syncolor.patch

@@ -1,25 +1,25 @@
-diff -up vim74/src/syntax.c.syncolor vim74/src/syntax.c
+diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c
---- vim74/src/syntax.c.syncolor	2014-04-16 15:10:30.362287904 +0200
+--- vim80/src/syntax.c.syncolor	2017-08-15 12:14:21.716020676 +0200
-+++ vim74/src/syntax.c	2014-04-16 15:12:50.278229744 +0200
++++ vim80/src/syntax.c	2017-08-15 12:30:31.380158974 +0200
-@@ -6840,8 +6840,8 @@ static char *(highlight_init_light[]) =
+@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) =
- 	CENT("Visual term=reverse",
+     CENT("Visual term=reverse",
- 	     "Visual term=reverse guibg=LightGrey"),
+ 	 "Visual term=reverse guibg=LightGrey"),
  #ifdef FEAT_DIFF
--	CENT("DiffAdd term=bold ctermbg=LightBlue",
+-    CENT("DiffAdd term=bold ctermbg=LightBlue",
--	     "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
+-	 "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
-+	CENT("DiffAdd term=bold ctermbg=LightRed",
++    CENT("DiffAdd term=bold ctermbg=LightRed",
-+	     "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"),
++         "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"),
- 	CENT("DiffChange term=bold ctermbg=LightMagenta",
+     CENT("DiffChange term=bold ctermbg=LightMagenta",
- 	     "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
+ 	 "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
- 	CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
+     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
-@@ -6928,8 +6928,8 @@ static char *(highlight_init_dark[]) =
+@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = {
- 	CENT("Visual term=reverse",
+     CENT("Visual term=reverse",
- 	     "Visual term=reverse guibg=DarkGrey"),
+ 	 "Visual term=reverse guibg=DarkGrey"),
  #ifdef FEAT_DIFF
--	CENT("DiffAdd term=bold ctermbg=DarkBlue",
+-    CENT("DiffAdd term=bold ctermbg=DarkBlue",
--	     "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
+-	 "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
-+	CENT("DiffAdd term=bold ctermbg=DarkRed",
++    CENT("DiffAdd term=bold ctermbg=DarkRed",
-+	     "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"),
++	 "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"),
- 	CENT("DiffChange term=bold ctermbg=DarkMagenta",
+     CENT("DiffChange term=bold ctermbg=DarkMagenta",
- 	     "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
+ 	 "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
- 	CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
+     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 938
+%define patchlevel 946
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -211,7 +211,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3004 -p1
 %patch3006 -p1
 %patch3007 -p1
-%patch3008 -p1
+%patch3008 -p1 -b .syncolor
 #patch3009 -p1
 %patch3010 -p1
 %patch3011 -p1
@@ -765,6 +765,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Aug 15 2017 Karsten Hopp <karsten@redhat.com> 8.0.946-1
+- patchlevel 946
+
 * Mon Aug 14 2017 Karsten Hopp <karsten@redhat.com> 8.0.938-1
 - patchlevel 938