commit 20c023aee0ceafac9431fb8ab8d169747b5140dd
author Bram Moolenaar <Bram@vim.org> Sun May 26 21:03:24 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sun May 26 21:03:24 2019 +0200
tree 479954fa4e6886dbc3bef40cb00569ae6cf440dc
parent 9d591525a5d7a693aa47b4a87c5f53c503500c1c

patch 8.1.1405: "highlight" option of popup windows not supported

Problem:    "highlight" option of popup windows not supported.
Solution:   Implement the "highlight" option.

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index 7210ce2..0db2820 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1447,18 +1447,14 @@
 	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;