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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0494
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0494
Problem: Functions do not check for a window ID in other tabs.
Solution: Also find the window ID in other than the current tab.
Files: src/evalfunc.c
*** ../vim-8.1.0493/src/evalfunc.c 2018-10-25 12:30:52.270659874 +0200
--- src/evalfunc.c 2018-10-25 12:37:49.997123096 +0200
***************
*** 5291,5297 ****
#ifdef FEAT_QUICKFIX
win_T *wp;
! wp = find_win_by_nr(&argvars[0], NULL);
get_qf_loc_list(FALSE, wp, &argvars[1], rettv);
#endif
}
--- 5291,5297 ----
#ifdef FEAT_QUICKFIX
win_T *wp;
! wp = find_win_by_nr_or_id(&argvars[0]);
get_qf_loc_list(FALSE, wp, &argvars[1], rettv);
#endif
}
***************
*** 5796,5802 ****
if (rettv_list_alloc(rettv) == FAIL)
return;
! wp = find_win_by_nr(&argvars[0], NULL);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_winrow + 1);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_wincol + 1);
}
--- 5796,5802 ----
if (rettv_list_alloc(rettv) == FAIL)
return;
! wp = find_win_by_nr_or_id(&argvars[0]);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_winrow + 1);
list_append_number(rettv->vval.v_list, wp == NULL ? 0 : wp->w_wincol + 1);
}
***************
*** 8028,8034 ****
if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL)
{
! *win = find_win_by_nr(&di->di_tv, NULL);
if (*win == NULL)
{
EMSG(_("E957: Invalid window number"));
--- 8028,8034 ----
if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL)
{
! *win = find_win_by_nr_or_id(&di->di_tv);
if (*win == NULL)
{
EMSG(_("E957: Invalid window number"));
***************
*** 10785,10791 ****
rettv->vval.v_number = -1;
! win = find_win_by_nr(&argvars[0], NULL);
if (win != NULL)
set_qf_ll_list(win, &argvars[1], &argvars[2], &argvars[3], rettv);
}
--- 10785,10791 ----
rettv->vval.v_number = -1;
! win = find_win_by_nr_or_id(&argvars[0]);
if (win != NULL)
set_qf_ll_list(win, &argvars[1], &argvars[2], &argvars[3], rettv);
}
***************
*** 13843,13849 ****
{
win_T *wp;
! wp = find_win_by_nr(&argvars[0], NULL);
if (wp == NULL)
rettv->vval.v_number = -1;
else
--- 13843,13849 ----
{
win_T *wp;
! wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL)
rettv->vval.v_number = -1;
else
***************
*** 13868,13874 ****
{
win_T *wp;
! wp = find_win_by_nr(&argvars[0], NULL);
if (wp == NULL)
rettv->vval.v_number = -1;
else
--- 13868,13874 ----
{
win_T *wp;
! wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL)
rettv->vval.v_number = -1;
else
***************
*** 14035,14041 ****
{
win_T *wp;
! wp = find_win_by_nr(&argvars[0], NULL);
if (wp == NULL)
rettv->vval.v_number = -1;
else
--- 14035,14041 ----
{
win_T *wp;
! wp = find_win_by_nr_or_id(&argvars[0]);
if (wp == NULL)
rettv->vval.v_number = -1;
else
*** ../vim-8.1.0493/src/version.c 2018-10-25 12:30:52.274659868 +0200
--- src/version.c 2018-10-25 12:38:27.696929844 +0200
***************
*** 794,795 ****
--- 794,797 ----
{ /* Add new patch number below this line */
+ /**/
+ 494,
/**/
--
hundred-and-one symptoms of being an internet addict:
10E. You start counting in hex.
/// 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 ///
|
