diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-07-28 20:36:51 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-07-28 22:19:11 -0400 |
| commit | 01e3690ca870276bfdc78d81a1bd75b7f1a78a9e (patch) | |
| tree | 954367e565bb18629262b83bdd3fc3905250f972 /test | |
| parent | 4c50f0dc7640ca11bbe1aea51e5b95b4f974347d (diff) | |
| download | rneovim-01e3690ca870276bfdc78d81a1bd75b7f1a78a9e.tar.gz rneovim-01e3690ca870276bfdc78d81a1bd75b7f1a78a9e.tar.bz2 rneovim-01e3690ca870276bfdc78d81a1bd75b7f1a78a9e.zip | |
vim-patch:8.1.1049: when user tries to exit with CTRL-C message is confusing
Problem: When user tries to exit with CTRL-C message is confusing.
Solution: Only mention ":qa!" when there is a changed buffer. (closes vim/vim#4163)
https://github.com/vim/vim/commit/a84a3dd6635fcd2e07f510cba6a999585dcc381a
vim-patch:8.1.1052: test for CTRL-C message sometimes fails
Problem: test for CTRL-C message sometimes fails
Solution: Make sure there are no changed buffers.
https://github.com/vim/vim/commit/553e5a5c568e7d175b65b0472cd6d9843b25f4c8
vim-patch:8.1.1053: warning for missing return statement
Problem: Warning for missing return statement. (Dominique Pelle)
Solution: Add return statement.
https://github.com/vim/vim/commit/d6c3f1fa2b5e1dd7dc87cf608d72b84ad696b58f
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/eval/system_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ui/cmdline_highlight_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/messages_spec.lua | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua index 865a890acf..13134bc6e7 100644 --- a/test/functional/eval/system_spec.lua +++ b/test/functional/eval/system_spec.lua @@ -275,7 +275,7 @@ describe('system()', function() ~ | ~ | ~ | - Type :qa! and press <E...all changes and exit Nvim | + Type :qa and press <Enter> to exit Nvim | ]]) end) end) @@ -481,7 +481,7 @@ describe('systemlist()', function() ~ | ~ | ~ | - Type :qa! and press <E...all changes and exit Nvim | + Type :qa and press <Enter> to exit Nvim | ]]) end) end) diff --git a/test/functional/ui/cmdline_highlight_spec.lua b/test/functional/ui/cmdline_highlight_spec.lua index 45808b3b1b..052414a43d 100644 --- a/test/functional/ui/cmdline_highlight_spec.lua +++ b/test/functional/ui/cmdline_highlight_spec.lua @@ -494,7 +494,7 @@ describe('Command-line coloring', function() {EOB:~ }| {EOB:~ }| {EOB:~ }| - Type :qa! and pr...nges and exit Nvim | + Type :qa and pre...nter> to exit Nvim | ]]) end) it('works fine with NUL, NL, CR', function() diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua index 2857c2fe1e..9a1a0f66a2 100644 --- a/test/functional/ui/messages_spec.lua +++ b/test/functional/ui/messages_spec.lua @@ -631,7 +631,7 @@ describe('ui/ext_messages', function() {1:~ }| {1:~ }| ]], messages={{ - content = {{ "Type :qa! and press <Enter> to abandon all changes and exit Nvim" }}, + content = {{ "Type :qa and press <Enter> to exit Nvim" }}, kind = ""} }} @@ -678,7 +678,7 @@ describe('ui/ext_messages', function() {1:~ }| ]], messages={ {kind="echomsg", content={{"howdy"}}}, - {kind="", content={{"Type :qa! and press <Enter> to abandon all changes and exit Nvim"}}}, + {kind="", content={{"Type :qa and press <Enter> to exit Nvim"}}}, {kind="echoerr", content={{"bork", 2}}}, {kind="emsg", content={{"E117: Unknown function: nosuchfunction", 2}}} }} |