Mercurial > vim
comparison src/search.c @ 15971:ced614446eaa v8.1.0991
patch 8.1.0991: cannot build with a mix of features
commit https://github.com/vim/vim/commit/975880b6e6de473b512995ef87ce072aaca934cf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 3 14:42:11 2019 +0100
patch 8.1.0991: cannot build with a mix of features
Problem: Cannot build with FEAT_EVAL defined and FEAT_SEARCH_EXTRA
undefined, and with FEAT_DIFF defined and FEAT_EVAL undefined.
Solution: Add a couple of #ifdefs. (closes #4067)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 03 Mar 2019 14:45:06 +0100 |
parents | e580c9d75443 |
children | 570a296aa0b4 |
comparison
equal
deleted
inserted
replaced
15970:4b4561a386cd | 15971:ced614446eaa |
---|---|
565 saved_spats[idx] = spats[0]; | 565 saved_spats[idx] = spats[0]; |
566 if (spats[idx].pat == NULL) | 566 if (spats[idx].pat == NULL) |
567 saved_spats[idx].pat = NULL; | 567 saved_spats[idx].pat = NULL; |
568 else | 568 else |
569 saved_spats[idx].pat = vim_strsave(spats[idx].pat); | 569 saved_spats[idx].pat = vim_strsave(spats[idx].pat); |
570 # ifdef FEAT_SEARCH_EXTRA | |
570 saved_spats_last_idx = last_idx; | 571 saved_spats_last_idx = last_idx; |
572 # endif | |
571 } | 573 } |
572 # ifdef FEAT_SEARCH_EXTRA | 574 # ifdef FEAT_SEARCH_EXTRA |
573 /* If 'hlsearch' set and search pat changed: need redraw. */ | 575 /* If 'hlsearch' set and search pat changed: need redraw. */ |
574 if (p_hls && idx == last_idx && !no_hlsearch) | 576 if (p_hls && idx == last_idx && !no_hlsearch) |
575 redraw_all_later(SOME_VALID); | 577 redraw_all_later(SOME_VALID); |