aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKillTheMule <KillTheMule@users.noreply.github.com>2017-09-18 22:35:05 +0200
committerKillTheMule <KillTheMule@users.noreply.github.com>2017-10-29 18:10:46 +0100
commit35b867d78687484a1153e957748547e4d043934a (patch)
tree55ef1546919d0ebe2ea5f0534414f40fedf90fcd /src
parent1fcd8389429b51d1d388f7f0a43566b4bcc9b9f4 (diff)
downloadrneovim-35b867d78687484a1153e957748547e4d043934a.tar.gz
rneovim-35b867d78687484a1153e957748547e4d043934a.tar.bz2
rneovim-35b867d78687484a1153e957748547e4d043934a.zip
Lint
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_cmds.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index fe0c662898..022ba6a4dd 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -100,9 +100,9 @@ typedef struct {
// Collected results of a substitution for showing them in
// the preview window
-typedef struct {
+typedef struct {
kvec_t(SubResult) subresults;
- linenr_T lines_needed; // lines neede in the preview window
+ linenr_T lines_needed; // lines neede in the preview window
} PreviewLines;
#ifdef INCLUDE_GENERATED_DECLARATIONS
@@ -3434,9 +3434,9 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout)
// lnum is where the match start, but maybe not the pattern match,
// since we can have \n before \zs in the pattern
- /* Advance "lnum" to the line where the match starts. The
- * match does not start in the first line when there is a line
- * break before \zs. */
+ // Advance "lnum" to the line where the match starts. The
+ // match does not start in the first line when there is a line
+ // break before \zs.
if (regmatch.startpos[0].lnum > 0) {
current_match.pre_match = lnum;
lnum += regmatch.startpos[0].lnum;
@@ -3965,7 +3965,6 @@ skip:
preview_lines.lines_needed += match_lines;
}
kv_push(preview_lines.subresults, current_match);
-
line_breakcheck();
}
@@ -4048,11 +4047,12 @@ skip:
// Show 'inccommand' preview if there are matched lines.
buf_T *preview_buf = NULL;
+ size_t subsize = preview_lines.subresults.size;
if (preview && !aborting()) {
if (got_quit) { // Substitution is too slow, disable 'inccommand'.
set_string_option_direct((char_u *)"icm", -1, (char_u *)"", OPT_FREE,
SID_NONE);
- } else if (*p_icm != NUL && preview_lines.subresults.size != 0 && pat != NULL) {
+ } else if (*p_icm != NUL && subsize != 0 && pat != NULL) {
if (pre_src_id == 0) {
// Get a unique new src_id, saved in a static
pre_src_id = bufhl_add_hl(NULL, 0, -1, 0, 0, 0);