astepano / rpms / vim

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