mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 21:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove superflous parameter from show_sub

Browse Source
This commit is contained in:
KillTheMule
2017-09-24 14:17:59 +02:00
parent 369ac900f9
commit 7b4baad674
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/ex_cmds.c
View File

@@ -4064,7 +4064,7 @@ skip:
pre_hl_id = syn_check_group((char_u *)"Substitute", 13); pre_hl_id = syn_check_group((char_u *)"Substitute", 13);
} }
curbuf->b_changed = save_b_changed; // preserve 'modified' during preview curbuf->b_changed = save_b_changed; // preserve 'modified' during preview
preview_buf = show_sub(eap, old_cursor, &preview_lines, true, preview_buf = show_sub(eap, old_cursor, &preview_lines,
pre_hl_id, pre_src_id); pre_hl_id, pre_src_id);
if (subsize > 0) { if (subsize > 0) {
bufhl_clear_line_range(orig_buf, pre_src_id, eap->line1, bufhl_clear_line_range(orig_buf, pre_src_id, eap->line1,
@@ -6077,8 +6077,7 @@ void set_context_in_sign_cmd(expand_T *xp, char_u *arg)
/// Shows the effects of the :substitute command being typed ('inccommand'). /// Shows the effects of the :substitute command being typed ('inccommand').
/// If inccommand=split, shows a preview window and later restores the layout. /// If inccommand=split, shows a preview window and later restores the layout.
static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, static buf_T *show_sub(exarg_T *eap, pos_T old_cusr,
PreviewLines *preview_lines, bool show_hl, int hl_id, PreviewLines *preview_lines, int hl_id, int src_id)
int src_id)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
static handle_T bufnr = 0; // special buffer, re-used on each visit static handle_T bufnr = 0; // special buffer, re-used on each visit
@@ -6198,16 +6197,12 @@ static buf_T *show_sub(exarg_T *eap, pos_T old_cusr,
} }
linenr_origbuf = match.end.lnum; linenr_origbuf = match.end.lnum;
if (show_hl) {
bufhl_add_hl_pos_offset(preview_buf, src_id, hl_id, p_start, bufhl_add_hl_pos_offset(preview_buf, src_id, hl_id, p_start,
p_end, col_width); p_end, col_width);
} }
}
if (show_hl) {
bufhl_add_hl_pos_offset(orig_buf, src_id, hl_id, match.start, bufhl_add_hl_pos_offset(orig_buf, src_id, hl_id, match.start,
match.end, 0); match.end, 0);
} }
}
xfree(str); xfree(str);
redraw_later(SOME_VALID); redraw_later(SOME_VALID);