1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.587
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.587
Problem: Compiler warning for local var shadowing global var.
Solution: Rename the var and move it to an inner block. (Christian Brabandt)
Files: src/buffer.c
*** ../vim-7.3.586/src/buffer.c 2012-06-20 17:54:34.000000000 +0200
--- src/buffer.c 2012-07-06 16:19:32.000000000 +0200
***************
*** 1363,1371 ****
int action;
{
buf_T *prevbuf;
- #ifdef FEAT_WINDOWS
- win_T *prevwin;
- #endif
int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL
|| action == DOBUF_WIPE);
--- 1363,1368 ----
***************
*** 1406,1412 ****
#endif
{
#ifdef FEAT_WINDOWS
! prevwin = curwin;
#endif
if (prevbuf == curbuf)
u_sync(FALSE);
--- 1403,1409 ----
#endif
{
#ifdef FEAT_WINDOWS
! win_T *previouswin = curwin;
#endif
if (prevbuf == curbuf)
u_sync(FALSE);
***************
*** 1415,1423 ****
&& !P_HID(prevbuf)
&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
#ifdef FEAT_WINDOWS
! if (curwin != prevwin && win_valid(prevwin))
/* autocommands changed curwin, Grr! */
! curwin = prevwin;
#endif
}
}
--- 1412,1420 ----
&& !P_HID(prevbuf)
&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
#ifdef FEAT_WINDOWS
! if (curwin != previouswin && win_valid(previouswin))
/* autocommands changed curwin, Grr! */
! curwin = previouswin;
#endif
}
}
*** ../vim-7.3.586/src/version.c 2012-07-06 13:40:44.000000000 +0200
--- src/version.c 2012-07-06 16:19:08.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 587,
/**/
--
There's no place like $(HOME)!
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
