diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-06-19 15:22:34 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-19 21:22:34 +0200 |
| commit | 3cc7462a0cc035c6e97896c12819549ce5e31b10 (patch) | |
| tree | 1adcb054885070f54d9043a031aa091d196214b8 /src | |
| parent | 74d19f685faf1ee2e96ddc54ae289ed5093f4e08 (diff) | |
| download | rneovim-3cc7462a0cc035c6e97896c12819549ce5e31b10.tar.gz rneovim-3cc7462a0cc035c6e97896c12819549ce5e31b10.tar.bz2 rneovim-3cc7462a0cc035c6e97896c12819549ce5e31b10.zip | |
vim-patch:8.0.0546: swap file exists briefly when opening the command window (#8588)
Problem: Swap file exists briefly when opening the command window.
Solution: Set the noswapfile command modifier before splitting the window.
(James McCoy, closes vim/vim#1620)
https://github.com/vim/vim/commit/3bab93998d01a01b7f2a071fa3b8054bb0094625
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/nvim/ex_getln.c | 7 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index b7863402d5..b59f852c2d 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -6033,10 +6033,11 @@ static void ex_cquit(exarg_T *eap) static void ex_quit_all(exarg_T *eap) { if (cmdwin_type != 0) { - if (eap->forceit) - cmdwin_result = K_XF1; /* ex_window() takes care of this */ - else + if (eap->forceit) { + cmdwin_result = K_XF1; // open_cmdwin() takes care of this + } else { cmdwin_result = K_XF2; + } return; } diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 9b1dcfcafb..774007c66e 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -861,7 +861,7 @@ static int command_line_execute(VimState *state, int key) if (s->c == cedit_key || s->c == K_CMDWIN) { if (ex_normal_busy == 0 && got_int == false) { // Open a window to edit the command line (and history). - s->c = ex_window(); + s->c = open_cmdwin(); s->some_key_typed = true; } } else { @@ -1444,7 +1444,7 @@ static int command_line_handle_key(CommandLineState *s) return command_line_not_changed(s); case K_IGNORE: - // Ignore mouse event or ex_window() result. + // Ignore mouse event or open_cmdwin() result. return command_line_not_changed(s); @@ -6001,7 +6001,7 @@ int cmd_gchar(int offset) * Ctrl_C if it is to be abandoned * K_IGNORE if editing continues */ -static int ex_window(void) +static int open_cmdwin(void) { struct cmdline_info save_ccline; bufref_T old_curbuf; @@ -6034,6 +6034,7 @@ static int ex_window(void) block_autocmds(); /* don't use a new tab page */ cmdmod.tab = 0; + cmdmod.noswapfile = 1; /* Create a window for the command-line buffer. */ if (win_split((int)p_cwh, WSP_BOT) == FAIL) { diff --git a/src/nvim/option.c b/src/nvim/option.c index 0851e6cc5f..68b0a525f1 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5811,7 +5811,7 @@ void buf_copy_options(buf_T *buf, int flags) buf->b_p_ml = p_ml; buf->b_p_ml_nobin = p_ml_nobin; buf->b_p_inf = p_inf; - buf->b_p_swf = p_swf; + buf->b_p_swf = cmdmod.noswapfile ? false : p_swf; buf->b_p_cpt = vim_strsave(p_cpt); buf->b_p_cfu = vim_strsave(p_cfu); buf->b_p_ofu = vim_strsave(p_ofu); |