jkunstle / rpms / vim

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