diff options
Diffstat (limited to 'src/nvim/search.c')
| -rw-r--r-- | src/nvim/search.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index e2781f17d5..055d2db445 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -4025,8 +4025,6 @@ find_pattern_in_path ( def_regmatch.rm_ic = FALSE; /* don't ignore case in define pat. */ } files = xcalloc(max_path_depth, sizeof(SearchedFile)); - if (files == NULL) - goto fpip_end; old_files = max_path_depth; depth = depth_displayed = -1; @@ -4627,18 +4625,15 @@ int read_viminfo_search_pattern(vir_T *virp, int force) hlsearch_on = TRUE; if (idx >= 0) { if (force || spats[idx].pat == NULL) { - val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), - TRUE); - if (val != NULL) { - set_last_search_pat(val, idx, magic, setlast); - free(val); - spats[idx].no_scs = no_scs; - spats[idx].off.line = off_line; - spats[idx].off.end = off_end; - spats[idx].off.off = off; - if (setlast) { - SET_NO_HLSEARCH(!hlsearch_on); - } + val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), TRUE); + set_last_search_pat(val, idx, magic, setlast); + free(val); + spats[idx].no_scs = no_scs; + spats[idx].off.line = off_line; + spats[idx].off.end = off_end; + spats[idx].off.off = off; + if (setlast) { + SET_NO_HLSEARCH(!hlsearch_on); } } } |