From 67d57f6917df51cc910ad83e202dedd8a5651cda Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 9 Dec 2016 09:49:13 -0500 Subject: [PATCH 1/6] version.c: Mark NA patches - 1727: garbagecollect_for_testing() - 1761,1762: NA Coverity issue - 1769: Adding attributes to if_pyth's sys.stdout - 1812: Athena/Motif GUI fixes - 1838: Rename of test functions (e.g., garbagecollect_for_testing()) to start with "test_" - 1844: More test function renames - 1888: Calculating sleep time for RealWaitForChar - 1903,1904,1905,1907,1911,1936: viminfo merging - 1955: Fix for 64-bit Vim linking against 32-bit Perl due to differing time_t - 1971: settmode() change for Solaris - 2073: Reading rgb.txt - 2093: Netbeans test - 2094: GUI color allocation changes - 2132, 2198: job tests --- src/nvim/version.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 61ffb1cae6..8526a94cc1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -242,7 +242,7 @@ static int included_patches[] = { 2201, // 2200, // 2199 NA - // 2198, + // 2198 NA // 2197, // 2196, // 2195 NA @@ -308,7 +308,7 @@ static int included_patches[] = { // 2135, // 2134, // 2133 NA - // 2132, + // 2132 NA // 2131 NA // 2130 NA // 2129 NA @@ -346,8 +346,8 @@ static int included_patches[] = { // 2097, // 2096, // 2095, - // 2094, - // 2093, + // 2094 NA + // 2093 NA // 2092 NA // 2091 NA // 2090, @@ -367,7 +367,7 @@ static int included_patches[] = { // 2076, // 2075, // 2074, - // 2073, + // 2073 NA // 2072, 2071, // 2070 NA @@ -468,7 +468,7 @@ static int included_patches[] = { // 1975, // 1974 NA 1973, - // 1972, + // 1972 NA 1971, 1970, // 1969 NA @@ -485,7 +485,7 @@ static int included_patches[] = { // 1958 NA // 1957 NA 1956, - // 1955, + // 1955 NA // 1954, 1953, 1952, @@ -504,7 +504,7 @@ static int included_patches[] = { // 1939 NA // 1938 NA 1937, - // 1936, + // 1936 NA // 1935 NA // 1934 NA // 1933 NA @@ -529,15 +529,15 @@ static int included_patches[] = { // 1914, 1913, 1912, - // 1911, + // 1911 NA // 1910, 1909, // 1908 NA - // 1907, + // 1907 NA // 1906 NA - // 1905, - // 1904, - // 1903, + // 1905 NA + // 1904 NA + // 1903 NA // 1902 NA // 1901 NA 1900, @@ -552,7 +552,7 @@ static int included_patches[] = { // 1891 NA // 1890 NA // 1889, - // 1888, + // 1888 NA // 1887 NA // 1886 NA // 1885 NA @@ -596,13 +596,13 @@ static int included_patches[] = { // 1847, // 1846 NA // 1845 NA - // 1844, + // 1844 NA // 1843 NA 1842, 1841, 1840, // 1839, - // 1838, + // 1838 NA 1837, 1836, 1835, @@ -628,7 +628,7 @@ static int included_patches[] = { 1815, // 1814 NA 1813, - // 1812, + // 1812 NA // 1811 NA // 1810 NA 1809, @@ -672,15 +672,15 @@ static int included_patches[] = { // 1772 NA // 1771 NA // 1770 NA - // 1769, + // 1769 NA 1768, // 1767 NA // 1766 NA 1765, // 1764 NA 1763, - // 1762, - // 1761, + // 1762 NA + // 1761 NA // 1760 NA 1759, 1758, @@ -715,7 +715,7 @@ static int included_patches[] = { 1730, // 1729 NA 1728, - // 1727, + // 1727 NA // 1726 NA // 1725 NA // 1724 NA From 27b5fa59f57130fc0396284a42a8f99d59dbecb6 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 1 Jan 2017 21:26:51 -0500 Subject: [PATCH 2/6] vim-patch:7.4.1656 Problem: Crash when using partial with a timer. Solution: Increment partial reference count. (Hirohito Higashi) https://github.com/vim/vim/commit/92e35efaf6a3278e4729115648997f09cd4005f5 The content of this was already applied in the partials PR, but no commit mentioned the upstream patch. --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 8526a94cc1..7da0572eb3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -786,7 +786,7 @@ static int included_patches[] = { // 1659 NA 1658, // 1657 NA - // 1656, + 1656, // 1655 NA 1654, // 1653 NA From be177bce8f0088a23d6dd897d522a9bfc8891871 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 2 Jan 2017 07:03:03 -0500 Subject: [PATCH 3/6] vim-patch:7.4.1781 Problem: synIDattr() does not respect 'guicolors'. Solution: Change the conditition for the mode. (Christian Brabandt) https://github.com/vim/vim/commit/da5b3dcf06a3af5b398450258be32b0416451a9b --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 7da0572eb3..8bb6b8f822 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -660,7 +660,7 @@ static int included_patches[] = { // 1784 NA 1783, 1782, - // 1781, + 1781, 1780, 1779, // 1778 NA From 94a08e8186dc69756098e23f07b416a1dcf10207 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 1 Jan 2017 21:47:50 -0500 Subject: [PATCH 4/6] vim-patch:7.4.1839 Problem: Cannot get the items stored in a partial. Solution: Support using get() on a partial. https://github.com/vim/vim/commit/2bbf8eff6fab16d86e7bcfc0da1962d31bec7891 The content of this was already applied in the partials PR, but no commit mentioned the upstream patch. --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 8bb6b8f822..bcf00863f0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -601,7 +601,7 @@ static int included_patches[] = { 1842, 1841, 1840, - // 1839, + 1839, // 1838 NA 1837, 1836, From 5b8bdca564dda25f47e0c1e5fe7d96158ff74eb0 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 1 Jan 2017 22:24:11 -0500 Subject: [PATCH 5/6] vim-patch:7.4.1861 Problem: Compiler warnings with 64 bit compiler. Solution: Change int to size_t. (Mike William) https://github.com/vim/vim/commit/b055066a1daf12c349d6c575aff22ae4d999a157 Functional changes had already been made when package feature was initially merged. --- src/nvim/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index bcf00863f0..5ebe03b7db 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -579,7 +579,7 @@ static int included_patches[] = { // 1864 NA // 1863 NA // 1862 NA - // 1861, + 1861, 1860, // 1859 NA // 1858 NA From 9264f4cbbb32a1fba27cd2e1f2206554d13529ba Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 2 Jan 2017 07:05:59 -0500 Subject: [PATCH 6/6] Mark 'execute()' patches applied vim-patch:7.4.1996 Problem: Capturing the output of a command takes a few commands. Solution: Add evalcmd(). https://github.com/vim/vim/commit/1e5e1231ac9e1ba9678812c96f9d554a078eeec4 vim-patch:7.4.1999 Problem: evalcmd() doesn't work recursively. Solution: Use redir_evalcmd instead of redir_vname. https://github.com/vim/vim/commit/bc5d6dd1dd1dc3a06e4e655fc9479529db288365 vim-patch:7.4.2000 Problem: Evalcmd test fails. Solution: Add missing piece. https://github.com/vim/vim/commit/245a7cb6d33e556415c9fcaa874b784a6d8f0ef3 vim-patch:7.4.2005 Problem: After using evalcmd() message output is in the wrong position. (Christian Brabandt) Solution: Reset msg_col. https://github.com/vim/vim/commit/ee1deb4a00f39f133558321ec535354497f490c8 --- src/nvim/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 5ebe03b7db..f6f984bc8b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -435,16 +435,16 @@ static int included_patches[] = { // 2008, 2007, // 2006, - // 2005, + 2005, // 2004 NA // 2003 NA // 2002, // 2001 NA - // 2000, - // 1999, + 2000, + 1999, // 1998 NA 1997, - // 1996, + 1996, // 1995 NA // 1994, // 1993,