diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-26 21:03:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-26 21:03:24 +0200 |
| commit | 20c023aee0ceafac9431fb8ab8d169747b5140dd (patch) | |
| tree | 479954fa4e6886dbc3bef40cb00569ae6cf440dc /src/diff.c | |
| parent | 9d591525a5d7a693aa47b4a87c5f53c503500c1c (diff) | |
| download | vim-git-20c023aee0ceafac9431fb8ab8d169747b5140dd.tar.gz | |
patch 8.1.1405: "highlight" option of popup windows not supportedv8.1.1405
Problem: "highlight" option of popup windows not supported.
Solution: Implement the "highlight" option.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/diff.c b/src/diff.c index 7210ce268..0db2820f3 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1447,18 +1447,14 @@ diff_win_options( wp->w_p_wrap_save = wp->w_p_wrap; wp->w_p_wrap = FALSE; # ifdef FEAT_FOLDING - curwin = wp; - curbuf = curwin->w_buffer; if (!wp->w_p_diff) { if (wp->w_p_diff_saved) free_string_option(wp->w_p_fdm_save); wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm); } - set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", + set_string_option_direct_in_win(wp, (char_u *)"fdm", -1, (char_u *)"diff", OPT_LOCAL|OPT_FREE, 0); - curwin = old_curwin; - curbuf = curwin->w_buffer; if (!wp->w_p_diff) { wp->w_p_fdc_save = wp->w_p_fdc; |