From 0cee3001947340c0d74d32a17a2c93147e13cb7f Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Sat, 2 Nov 2019 09:31:48 +0000 Subject: [PATCH] Simplify split_success logic --- src/nvim/ex_cmds.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index a71b249a92..8cdf971b9e 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -5566,12 +5566,7 @@ static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, linenr_T highest_num_line = 0; int col_width = 0; - // if we fail to split the window, we don't want to modify orig_buf - bool split_success = false; - if (split && win_split((int)p_cwh, WSP_BOT) != FAIL) { - split_success = true; - buf_open_scratch(preview_buf ? bufnr : 0, "[Preview]"); buf_clear(); preview_buf = curbuf; @@ -5589,6 +5584,9 @@ static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, highest_num_line = kv_last(lines.subresults).end.lnum; col_width = log10(highest_num_line) + 1 + 3; } + } else { + // if we fail to split the window, we don't want to modify the preview buffer + preview_buf = NULL; } char *str = NULL; // construct the line to show in here @@ -5601,7 +5599,7 @@ static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, for (size_t matchidx = 0; matchidx < lines.subresults.size; matchidx++) { SubResult match = lines.subresults.items[matchidx]; - if (split_success && preview_buf) { + if (preview_buf) { lpos_T p_start = { 0, match.start.col }; // match starts here in preview lpos_T p_end = { 0, match.end.col }; // ... and ends here