From a04854932ec96ab48498fd4a5e8b5f4fd4df14cf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 16 Jul 2014 23:39:54 +0200 Subject: updated for version 7.4.373 Problem: Compiler warning for unused argument and unused variable. Solution: Add UNUSED. Move variable inside #ifdef. --- src/charset.c | 4 ++-- src/version.c | 2 ++ src/window.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/charset.c b/src/charset.c index 83a6850df2..e7aabe7ed5 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1024,7 +1024,7 @@ vim_isprintc_strict(c) */ int lbr_chartabsize(line, s, col) - char_u *line; /* start of the line */ + char_u *line UNUSED; /* start of the line */ unsigned char *s; colnr_T col; { @@ -1069,7 +1069,7 @@ lbr_chartabsize_adv(line, s, col) int win_lbr_chartabsize(wp, line, s, col, headp) win_T *wp; - char_u *line; /* start of the line */ + char_u *line UNUSED; /* start of the line */ char_u *s; colnr_T col; int *headp UNUSED; diff --git a/src/version.c b/src/version.c index 0a8607de8f..47d5adb5f4 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 373, /**/ 372, /**/ diff --git a/src/window.c b/src/window.c index 9fe56b1f88..f81f5527b5 100644 --- a/src/window.c +++ b/src/window.c @@ -686,9 +686,7 @@ win_split_ins(size, flags, new_wp, dir) int layout; frame_T *frp, *curfrp; int before; - int minwidth; int minheight; - int wmw1; int wmh1; if (flags & WSP_TOP) @@ -718,6 +716,9 @@ win_split_ins(size, flags, new_wp, dir) #ifdef FEAT_VERTSPLIT if (flags & WSP_VERT) { + int wmw1; + int minwidth; + layout = FR_ROW; /* -- cgit v1.2.3