3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.185
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.185
3ef2ca
Problem:    Clang gives warnings.
3ef2ca
Solution:   Adjust how bigness is set. (Dominique Pelle)
3ef2ca
Files:      src/ex_cmds.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.184/src/ex_cmds.c	2014-02-11 12:15:39.781950970 +0100
3ef2ca
--- src/ex_cmds.c	2014-02-22 22:25:45.800904843 +0100
3ef2ca
***************
3ef2ca
*** 4099,4110 ****
3ef2ca
       * 'scroll' */
3ef2ca
      if (eap->forceit)
3ef2ca
  	bigness = curwin->w_height;
3ef2ca
-     else if (firstwin == lastwin)
3ef2ca
- 	bigness = curwin->w_p_scr * 2;
3ef2ca
  #ifdef FEAT_WINDOWS
3ef2ca
!     else
3ef2ca
  	bigness = curwin->w_height - 3;
3ef2ca
  #endif
3ef2ca
      if (bigness < 1)
3ef2ca
  	bigness = 1;
3ef2ca
  
3ef2ca
--- 4099,4110 ----
3ef2ca
       * 'scroll' */
3ef2ca
      if (eap->forceit)
3ef2ca
  	bigness = curwin->w_height;
3ef2ca
  #ifdef FEAT_WINDOWS
3ef2ca
!     else if (firstwin != lastwin)
3ef2ca
  	bigness = curwin->w_height - 3;
3ef2ca
  #endif
3ef2ca
+     else
3ef2ca
+ 	bigness = curwin->w_p_scr * 2;
3ef2ca
      if (bigness < 1)
3ef2ca
  	bigness = 1;
3ef2ca
  
3ef2ca
*** ../vim-7.4.184/src/version.c	2014-02-22 22:18:39.536905522 +0100
3ef2ca
--- src/version.c	2014-02-22 22:22:51.912905120 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     185,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
3ef2ca
Linux, etc, and those who know COBOL.  It gets very difficult for me at
3ef2ca
parties, not knowing which group to socialise with :-)
3ef2ca
						Sitaram Chamarty
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    ///