aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Twupack <atwupack@mailbox.org>2014-09-15 23:35:13 +0200
committerAndré Twupack <atwupack@mailbox.org>2014-09-18 22:31:01 +0200
commitab4feeac8227386428196445aa9036b9f5523ae6 (patch)
treece72a362d017feca45b9a3509061ec0071d64cc3
parent781d129445dbd1ded68788413aefa226eb60d382 (diff)
downloadrneovim-ab4feeac8227386428196445aa9036b9f5523ae6.tar.gz
rneovim-ab4feeac8227386428196445aa9036b9f5523ae6.tar.bz2
rneovim-ab4feeac8227386428196445aa9036b9f5523ae6.zip
vim-patch:7.4.373
Problem: Compiler warning for unused argument and unused variable. Solution: Add UNUSED. Move variable inside #ifdef. https://code.google.com/p/vim/source/detail?r=v7-4-373
-rw-r--r--src/nvim/version.c2
-rw-r--r--src/nvim/window.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 27f9e99dcf..57634f49c1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -222,7 +222,7 @@ static int included_patches[] = {
376,
//375,
//374,
- //373 NA
+ 373,
372,
371,
370,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index c96884f69a..38f61ee45e 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -542,9 +542,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
int layout;
frame_T *frp, *curfrp;
int before;
- int minwidth;
int minheight;
- int wmw1;
int wmh1;
if (flags & WSP_TOP)
@@ -565,6 +563,9 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
if (flags & WSP_VERT) {
+ int wmw1;
+ int minwidth;
+
layout = FR_ROW;
/*