Mercurial > vim

diff src/diff.c @ 16806:306766ed0f70 v8.1.1405

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1405: "highlight" option of popup windows not supported commit https://github.com/vim/vim/commit/20c023aee0ceafac9431fb8ab8d169747b5140dd Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 26 21:03:24 2019 +0200 patch 8.1.1405: "highlight" option of popup windows not supported Problem: "highlight" option of popup windows not supported. Solution: Implement the "highlight" option.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 May 2019 21:15:04 +0200
parents 695d9ef00b03
children ce04ebdf26b8
line wrap: on
line diff
--- 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;