thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0209

Browse Source
This commit is contained in:
Bram Moolenaar
2006-02-27 23:58:35 +00:00
parent eddf53b02e
commit 5e3cb7e869
38 changed files with 878 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/diff.c
View File

@@ -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;