diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-22 01:51:24 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-22 01:51:24 -0400 |
| commit | fd46f22d019035cb8166a78cb92ade66f5c6ebf8 (patch) | |
| tree | 0f2afde0784b0efb7c2c36dc899f9e9bd76d406e /src | |
| parent | 7df4ed3a5b8779ca7fa9f42e0f0455b033461b82 (diff) | |
| parent | 5f3e677e21c08008074c3d6929695ffb34827cb7 (diff) | |
| download | rneovim-fd46f22d019035cb8166a78cb92ade66f5c6ebf8.tar.gz rneovim-fd46f22d019035cb8166a78cb92ade66f5c6ebf8.tar.bz2 rneovim-fd46f22d019035cb8166a78cb92ade66f5c6ebf8.zip | |
Merge pull request #1101 from atwupack/vp-7.4.339
vim-patch:7.4.339
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index a878ba6455..6eac1033c4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -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. */ -void check_winopt(winopt_T *wop) +static void check_winopt(winopt_T *wop) { check_string_option(&wop->wo_fdi); check_string_option(&wop->wo_fdm); diff --git a/src/nvim/version.c b/src/nvim/version.c index fa8008280f..9042524217 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -256,7 +256,7 @@ static int included_patches[] = { //342 NA //341, //340 NA - //339, + 339, 338, //337, //336, |