From 8192267deacdf958848324f6b7f99e72551c56e6 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 17 Jun 2018 06:51:03 -0400 Subject: vim-patch:8.0.0609: some people still don't know how to quit (#8571) Problem: For some people the hint about quitting is not sufficient. Solution: Put separately. Also use ":qa!" to get out even when there are changes. https://github.com/vim/vim/commit/28a8193e3113f676f89fb6312b099d849df881d3 --- src/nvim/normal.c | 6 ++++-- test/functional/eval/system_spec.lua | 4 ++-- test/functional/ui/cmdline_highlight_spec.lua | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 6d3ffab030..b959ea08f3 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -7464,8 +7464,10 @@ static void nv_esc(cmdarg_T *cap) if (restart_edit == 0 && cmdwin_type == 0 && !VIsual_active - && no_reason) - MSG(_("Type :quit to exit Nvim")); + && no_reason) { + MSG(_("Type :qa! and press to abandon all changes" + " and exit Nvim")); + } /* Don't reset "restart_edit" when 'insertmode' is set, it won't be * set again below when halfway through a mapping. */ diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua index 23cea4c038..5e12b6a6a4 100644 --- a/test/functional/eval/system_spec.lua +++ b/test/functional/eval/system_spec.lua @@ -241,7 +241,7 @@ describe('system()', function() ~ | ~ | ~ | - Type :quit to exit Nvim | + Type :qa! and press to exit Nvim | + Type :qa! and press to exit Nvim | + Type :qa! and pr...nges and exit Nvim | ]]) end) it('works fine with NUL, NL, CR', function() -- cgit