diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-06-25 14:44:10 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-06-25 14:44:10 +0200 |
commit | 8dc907d7d30c9f60f14f197e99f2f62001dd09f0 (patch) | |
tree | 1a1192f42bcabe0b2ee1f1f350ba16acb76a5a8e | |
parent | 597a422416f37f8e22ed8f561667d6bab8814958 (diff) | |
download | vim-git-8dc907d7d30c9f60f14f197e99f2f62001dd09f0.tar.gz |
updated for version 7.4.339v7.4.339
Problem: Local function is available globally.
Solution: Add "static".
-rw-r--r-- | src/option.c | 3 | ||||
-rw-r--r-- | src/proto/option.pro | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index 05dc992d9..05d8869ea 100644 --- a/src/option.c +++ b/src/option.c @@ -3074,6 +3074,7 @@ static int istermoption __ARGS((struct vimoption *)); static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags)); static char_u *get_varp __ARGS((struct vimoption *)); static void option_value2string __ARGS((struct vimoption *, int opt_flags)); +static void check_winopt __ARGS((winopt_T *wop)); static int wc_use_keyname __ARGS((char_u *varp, long *wcp)); #ifdef FEAT_LANGMAP static void langmap_init __ARGS((void)); @@ -10305,7 +10306,7 @@ check_win_options(win) /* * Check for NULL pointers in a winopt_T and replace them with empty_option. */ - void + static void check_winopt(wop) winopt_T *wop UNUSED; { diff --git a/src/proto/option.pro b/src/proto/option.pro index 4729c4784..e426e6cfa 100644 --- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -40,7 +40,6 @@ char_u *get_equalprg __ARGS((void)); void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to)); void copy_winopt __ARGS((winopt_T *from, winopt_T *to)); void check_win_options __ARGS((win_T *win)); -void check_winopt __ARGS((winopt_T *wop)); void clear_winopt __ARGS((winopt_T *wop)); void buf_copy_options __ARGS((buf_T *buf, int flags)); void reset_modifiable __ARGS((void)); diff --git a/src/version.c b/src/version.c index 78d39bb71..8568a363c 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 339, +/**/ 338, /**/ 337, |