summaryrefslogtreecommitdiff
path: root/src/move.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-01-10 22:26:17 +0100
committerBram Moolenaar <Bram@vim.org>2012-01-10 22:26:17 +0100
commit70b2a56d5a8fd54f3d0707fa77dea86a4bd8195f (patch)
tree2144b21b49d79de16665fb585daf1e9cf66e85c0 /src/move.c
parent1f5965b3c4d2b29e167a5dfecdf0ec59fe4c45c0 (diff)
downloadvim-git-70b2a56d5a8fd54f3d0707fa77dea86a4bd8195f.tar.gz
updated for version 7.3.400v7.3.400
Problem: Compiler warnings for shadowed variables. Solution: Remove or rename the variables.
Diffstat (limited to 'src/move.c')
-rw-r--r--src/move.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/move.c b/src/move.c
index 79df9285a..f922da8e4 100644
--- a/src/move.c
+++ b/src/move.c
@@ -926,8 +926,8 @@ curwin_col_off2()
* Also updates curwin->w_leftcol.
*/
void
-curs_columns(scroll)
- int scroll; /* when TRUE, may scroll horizontally */
+curs_columns(may_scroll)
+ int may_scroll; /* when TRUE, may scroll horizontally */
{
int diff;
int extra; /* offset for first screen line */
@@ -1014,7 +1014,7 @@ curs_columns(scroll)
/* No line wrapping: compute curwin->w_leftcol if scrolling is on and line
* is not folded.
* If scrolling is off, curwin->w_leftcol is assumed to be 0 */
- else if (scroll
+ else if (may_scroll
#ifdef FEAT_FOLDING
&& !curwin->w_cline_folded
#endif