|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.339
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.339
|
|
|
073263 |
Problem: Local function is available globally.
|
|
|
073263 |
Solution: Add "static".
|
|
|
073263 |
Files: src/option.c, src/proto/option.pro
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.338/src/option.c 2014-06-25 14:39:35.110348584 +0200
|
|
|
073263 |
--- src/option.c 2014-06-25 14:42:33.986355351 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 3074,3079 ****
|
|
|
073263 |
--- 3074,3080 ----
|
|
|
073263 |
static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags));
|
|
|
073263 |
static char_u *get_varp __ARGS((struct vimoption *));
|
|
|
073263 |
static void option_value2string __ARGS((struct vimoption *, int opt_flags));
|
|
|
073263 |
+ static void check_winopt __ARGS((winopt_T *wop));
|
|
|
073263 |
static int wc_use_keyname __ARGS((char_u *varp, long *wcp));
|
|
|
073263 |
#ifdef FEAT_LANGMAP
|
|
|
073263 |
static void langmap_init __ARGS((void));
|
|
|
073263 |
***************
|
|
|
073263 |
*** 10305,10311 ****
|
|
|
073263 |
/*
|
|
|
073263 |
* Check for NULL pointers in a winopt_T and replace them with empty_option.
|
|
|
073263 |
*/
|
|
|
073263 |
! void
|
|
|
073263 |
check_winopt(wop)
|
|
|
073263 |
winopt_T *wop UNUSED;
|
|
|
073263 |
{
|
|
|
073263 |
--- 10306,10312 ----
|
|
|
073263 |
/*
|
|
|
073263 |
* Check for NULL pointers in a winopt_T and replace them with empty_option.
|
|
|
073263 |
*/
|
|
|
073263 |
! static void
|
|
|
073263 |
check_winopt(wop)
|
|
|
073263 |
winopt_T *wop UNUSED;
|
|
|
073263 |
{
|
|
|
073263 |
*** ../vim-7.4.338/src/proto/option.pro 2014-06-25 14:39:35.110348584 +0200
|
|
|
073263 |
--- src/proto/option.pro 2014-06-25 14:42:38.702355530 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 40,46 ****
|
|
|
073263 |
void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to));
|
|
|
073263 |
void copy_winopt __ARGS((winopt_T *from, winopt_T *to));
|
|
|
073263 |
void check_win_options __ARGS((win_T *win));
|
|
|
073263 |
- void check_winopt __ARGS((winopt_T *wop));
|
|
|
073263 |
void clear_winopt __ARGS((winopt_T *wop));
|
|
|
073263 |
void buf_copy_options __ARGS((buf_T *buf, int flags));
|
|
|
073263 |
void reset_modifiable __ARGS((void));
|
|
|
073263 |
--- 40,45 ----
|
|
|
073263 |
*** ../vim-7.4.338/src/version.c 2014-06-25 14:39:35.114348584 +0200
|
|
|
073263 |
--- src/version.c 2014-06-25 14:43:41.502357905 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 736,737 ****
|
|
|
073263 |
--- 736,739 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 339,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
MORTICIAN: What?
|
|
|
073263 |
CUSTOMER: Nothing -- here's your nine pence.
|
|
|
073263 |
DEAD PERSON: I'm not dead!
|
|
|
073263 |
MORTICIAN: Here -- he says he's not dead!
|
|
|
073263 |
CUSTOMER: Yes, he is.
|
|
|
073263 |
DEAD PERSON: I'm not!
|
|
|
073263 |
The Quest for the Holy Grail (Monty Python)
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|