Mercurial > vim
diff src/option.c @ 5102:11d0c6df1d7b v7.3.1294
updated for version 7.3.1294
Problem: ":diffoff" resets options.
Solution: Save and restore option values. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 03 Jul 2013 15:47:03 +0200 |
| parents | cf52d2a8c05c |
| children | 7a6ce0c426fe |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -10118,14 +10118,19 @@ copy_winopt(from, to) to->wo_stl = vim_strsave(from->wo_stl); #endif to->wo_wrap = from->wo_wrap; +#ifdef FEAT_DIFF + to->wo_wrap_save = from->wo_wrap_save; +#endif #ifdef FEAT_LINEBREAK to->wo_lbr = from->wo_lbr; #endif #ifdef FEAT_SCROLLBIND to->wo_scb = from->wo_scb; + to->wo_scb_save = from->wo_scb_save; #endif #ifdef FEAT_CURSORBIND to->wo_crb = from->wo_crb; + to->wo_crb_save = from->wo_crb_save; #endif #ifdef FEAT_SPELL to->wo_spell = from->wo_spell; @@ -10137,6 +10142,7 @@ copy_winopt(from, to) #endif #ifdef FEAT_DIFF to->wo_diff = from->wo_diff; + to->wo_diff_saved = from->wo_diff_saved; #endif #ifdef FEAT_CONCEAL to->wo_cocu = vim_strsave(from->wo_cocu); @@ -10144,11 +10150,16 @@ copy_winopt(from, to) #endif #ifdef FEAT_FOLDING to->wo_fdc = from->wo_fdc; + to->wo_fdc_save = from->wo_fdc_save; to->wo_fen = from->wo_fen; + to->wo_fen_save = from->wo_fen_save; to->wo_fdi = vim_strsave(from->wo_fdi); to->wo_fml = from->wo_fml; to->wo_fdl = from->wo_fdl; + to->wo_fdl_save = from->wo_fdl_save; to->wo_fdm = vim_strsave(from->wo_fdm); + to->wo_fdm_save = from->wo_diff_saved + ? vim_strsave(from->wo_fdm_save) : empty_option; to->wo_fdn = from->wo_fdn; # ifdef FEAT_EVAL to->wo_fde = vim_strsave(from->wo_fde); @@ -10180,6 +10191,7 @@ check_winopt(wop) #ifdef FEAT_FOLDING check_string_option(&wop->wo_fdi); check_string_option(&wop->wo_fdm); + check_string_option(&wop->wo_fdm_save); # ifdef FEAT_EVAL check_string_option(&wop->wo_fde); check_string_option(&wop->wo_fdt); @@ -10210,6 +10222,7 @@ clear_winopt(wop) #ifdef FEAT_FOLDING clear_string_option(&wop->wo_fdi); clear_string_option(&wop->wo_fdm); + clear_string_option(&wop->wo_fdm_save); # ifdef FEAT_EVAL clear_string_option(&wop->wo_fde); clear_string_option(&wop->wo_fdt);