Merge pull request #1101 from atwupack/vp-7.4.339

vim-patch:7.4.339
This commit is contained in:
Justin M. Keyes
2014-08-22 01:51:24 -04:00
2 changed files with 2 additions and 2 deletions

View File

@@ -6850,7 +6850,7 @@ void check_win_options(win_T *win)
/* /*
* Check for NULL pointers in a winopt_T and replace them with empty_option. * Check for NULL pointers in a winopt_T and replace them with empty_option.
*/ */
void check_winopt(winopt_T *wop) static void check_winopt(winopt_T *wop)
{ {
check_string_option(&wop->wo_fdi); check_string_option(&wop->wo_fdi);
check_string_option(&wop->wo_fdm); check_string_option(&wop->wo_fdm);

View File

@@ -256,7 +256,7 @@ static int included_patches[] = {
//342 NA //342 NA
//341, //341,
//340 NA //340 NA
//339, 339,
338, 338,
//337, //337,
//336, //336,