diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-02-27 23:58:35 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-02-27 23:58:35 +0000 |
commit | 5e3cb7e8699f855193179a8cb799d1087f4a2ac9 (patch) | |
tree | 297e019074e2c2b85d5151701fcfae03bf02ceb9 /src/diff.c | |
parent | eddf53b02e2b007208b19c74fb616be2c0839b36 (diff) | |
download | vim-git-5e3cb7e8699f855193179a8cb799d1087f4a2ac9.tar.gz |
updated for version 7.0209v7.0209
Diffstat (limited to 'src/diff.c')
-rw-r--r-- | src/diff.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/diff.c b/src/diff.c index d5cb97c4e..82be8b9ae 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1083,10 +1083,7 @@ diff_win_options(wp, addbuf) curwin = wp; curbuf = curwin->w_buffer; set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", - OPT_LOCAL|OPT_FREE); -# ifdef FEAT_EVAL - set_option_scriptID((char_u *)"fdm", current_SID); -# endif + OPT_LOCAL|OPT_FREE, 0); curwin = old_curwin; curbuf = curwin->w_buffer; wp->w_p_fdc = 2; @@ -1133,10 +1130,7 @@ ex_diffoff(eap) curwin = wp; curbuf = curwin->w_buffer; set_string_option_direct((char_u *)"fdm", -1, - (char_u *)"manual", OPT_LOCAL|OPT_FREE); -# ifdef FEAT_EVAL - set_option_scriptID((char_u *)"fdm", current_SID); -# endif + (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0); curwin = old_curwin; curbuf = curwin->w_buffer; wp->w_p_fdc = 0; |