jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.373
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.373
073263
Problem:    Compiler warning for unused argument and unused variable.
073263
Solution:   Add UNUSED.  Move variable inside #ifdef.
073263
Files:	    src/charset.c, src/window.c
073263
073263
073263
*** ../vim-7.4.372/src/charset.c	2014-07-02 19:59:35.450375136 +0200
073263
--- src/charset.c	2014-07-16 23:36:51.211088615 +0200
073263
***************
073263
*** 1024,1030 ****
073263
   */
073263
      int
073263
  lbr_chartabsize(line, s, col)
073263
!     char_u		*line; /* start of the line */
073263
      unsigned char	*s;
073263
      colnr_T		col;
073263
  {
073263
--- 1024,1030 ----
073263
   */
073263
      int
073263
  lbr_chartabsize(line, s, col)
073263
!     char_u		*line UNUSED; /* start of the line */
073263
      unsigned char	*s;
073263
      colnr_T		col;
073263
  {
073263
***************
073263
*** 1069,1075 ****
073263
      int
073263
  win_lbr_chartabsize(wp, line, s, col, headp)
073263
      win_T	*wp;
073263
!     char_u	*line; /* start of the line */
073263
      char_u	*s;
073263
      colnr_T	col;
073263
      int		*headp UNUSED;
073263
--- 1069,1075 ----
073263
      int
073263
  win_lbr_chartabsize(wp, line, s, col, headp)
073263
      win_T	*wp;
073263
!     char_u	*line UNUSED; /* start of the line */
073263
      char_u	*s;
073263
      colnr_T	col;
073263
      int		*headp UNUSED;
073263
*** ../vim-7.4.372/src/window.c	2014-07-16 18:19:22.911475762 +0200
073263
--- src/window.c	2014-07-16 23:38:31.567086575 +0200
073263
***************
073263
*** 686,694 ****
073263
      int		layout;
073263
      frame_T	*frp, *curfrp;
073263
      int		before;
073263
-     int		minwidth;
073263
      int		minheight;
073263
-     int		wmw1;
073263
      int		wmh1;
073263
  
073263
      if (flags & WSP_TOP)
073263
--- 686,692 ----
073263
***************
073263
*** 718,723 ****
073263
--- 716,724 ----
073263
  #ifdef FEAT_VERTSPLIT
073263
      if (flags & WSP_VERT)
073263
      {
073263
+ 	int	wmw1;
073263
+ 	int	minwidth;
073263
+ 
073263
  	layout = FR_ROW;
073263
  
073263
  	/*
073263
*** ../vim-7.4.372/src/version.c	2014-07-16 18:19:22.915475762 +0200
073263
--- src/version.c	2014-07-16 23:36:20.775089233 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     373,
073263
  /**/
073263
073263
-- 
073263
INSPECTOR END OF FILM: Move along.  There's nothing to see!  Keep moving!
073263
   [Suddenly he notices the cameras.]
073263
INSPECTOR END OF FILM: (to Camera) All right, put that away sonny.
073263
   [He walks over to it and puts his hand over the lens.]
073263
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
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    ///