diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 3 | ||||
| -rw-r--r-- | test/functional/ui/inccommand_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/input_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 3 |
6 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index c704d29f10..e6b9516b6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -127,6 +127,7 @@ addons: branches: only: - master + - /^release-\d+\.\d+$/ cache: apt: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 629f70dc6e..1798b20204 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,8 +112,8 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY # version string, else they are combined with the result of `git describe`. set(NVIM_VERSION_MAJOR 0) set(NVIM_VERSION_MINOR 3) -set(NVIM_VERSION_PATCH 2) -set(NVIM_VERSION_PRERELEASE "") # for package maintainers +set(NVIM_VERSION_PATCH 3) +set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers # API level set(NVIM_API_LEVEL 5) # Bump this after any API change. diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index d1e456f185..ecfdeaeda3 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -1675,8 +1675,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term, } // Blacklist of terminals that cannot be trusted to report DECSCUSR support. - if (!(st || (vte_version != 0 && vte_version < 3900) - || (konsolev > 0 && konsolev < 180770))) { + if (!(st || (vte_version != 0 && vte_version < 3900) || konsolev)) { data->unibi_ext.reset_cursor_style = unibi_find_ext_str(ut, "Se"); data->unibi_ext.set_cursor_style = unibi_find_ext_str(ut, "Ss"); } diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua index bb6cb543ed..3228d6b7fc 100644 --- a/test/functional/ui/inccommand_spec.lua +++ b/test/functional/ui/inccommand_spec.lua @@ -2512,6 +2512,9 @@ describe(":substitute", function() end) it(':substitute with inccommand during :terminal activity', function() + if helpers.skip_fragile(pending) then + return + end retry(2, 40000, function() local screen = Screen.new(30,15) clear() diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua index 7f9cd190ee..850efed282 100644 --- a/test/functional/ui/input_spec.lua +++ b/test/functional/ui/input_spec.lua @@ -61,6 +61,9 @@ describe('feeding large chunks of input with <Paste>', function() end) it('ok', function() + if helpers.skip_fragile(pending) then + return + end local t = {} for i = 1, 20000 do t[i] = 'item ' .. tostring(i) diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index aa99499ec6..87b489fd71 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -51,6 +51,9 @@ describe("shell command :!", function() end) it("throttles shell-command output greater than ~10KB", function() + if helpers.skip_fragile(pending) then + return + end child_session.feed_data( ":!for i in $(seq 2 30000); do echo XXXXXXXXXX $i; done\n") |