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