comparison src/diff.c @ 681:9364d114ed8d v7.0204

updated for version 7.0204
author vimboss
date Wed, 22 Feb 2006 21:25:37 +0000
parents db58b9066b21
children f1b013312711
comparison
equal deleted inserted replaced
680:5b101ff9d4c4 681:9364d114ed8d
1076 1076
1077 curwin = wp; 1077 curwin = wp;
1078 curbuf = curwin->w_buffer; 1078 curbuf = curwin->w_buffer;
1079 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", 1079 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
1080 OPT_LOCAL|OPT_FREE); 1080 OPT_LOCAL|OPT_FREE);
1081 # ifdef FEAT_EVAL
1082 set_option_scriptID((char_u *)"fdm", current_SID);
1083 # endif
1081 curwin = old_curwin; 1084 curwin = old_curwin;
1082 curbuf = curwin->w_buffer; 1085 curbuf = curwin->w_buffer;
1083 wp->w_p_fdc = 2; 1086 wp->w_p_fdc = 2;
1084 wp->w_p_fen = TRUE; 1087 wp->w_p_fen = TRUE;
1085 wp->w_p_fdl = 0; 1088 wp->w_p_fdl = 0;
1123 #ifdef FEAT_FOLDING 1126 #ifdef FEAT_FOLDING
1124 curwin = wp; 1127 curwin = wp;
1125 curbuf = curwin->w_buffer; 1128 curbuf = curwin->w_buffer;
1126 set_string_option_direct((char_u *)"fdm", -1, 1129 set_string_option_direct((char_u *)"fdm", -1,
1127 (char_u *)"manual", OPT_LOCAL|OPT_FREE); 1130 (char_u *)"manual", OPT_LOCAL|OPT_FREE);
1131 # ifdef FEAT_EVAL
1132 set_option_scriptID((char_u *)"fdm", current_SID);
1133 # endif
1128 curwin = old_curwin; 1134 curwin = old_curwin;
1129 curbuf = curwin->w_buffer; 1135 curbuf = curwin->w_buffer;
1130 wp->w_p_fdc = 0; 1136 wp->w_p_fdc = 0;
1131 wp->w_p_fen = FALSE; 1137 wp->w_p_fen = FALSE;
1132 wp->w_p_fdl = 0; 1138 wp->w_p_fdl = 0;