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
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
To: vim_dev@googlegroups.com
Subject: Patch 7.4.386
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.4.386
Problem: When splitting a window the changelist position is wrong.
Solution: Copy the changelist position. (Jacob Niehus)
Files: src/window.c, src/testdir/Make_amiga.mak,
src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
src/testdir/Make_os2.mak, src/testdir/Make_vms.mms,
src/testdir/Makefile, src/testdir/test_changelist.in,
src/testdir/test_changelist.ok
*** ../vim-7.4.385/src/window.c 2014-07-23 15:21:16.247917462 +0200
--- src/window.c 2014-07-30 13:55:49.275607374 +0200
***************
*** 1178,1183 ****
--- 1178,1188 ----
p_wh = size;
}
+ #ifdef FEAT_JUMPLIST
+ /* Keep same changelist position in new window. */
+ wp->w_changelistidx = oldwin->w_changelistidx;
+ #endif
+
/*
* make the new window the current window
*/
*** ../vim-7.4.385/src/testdir/Make_amiga.mak 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Make_amiga.mak 2014-07-30 13:54:06.871608110 +0200
***************
*** 41,46 ****
--- 41,47 ----
test_listlbr.out \
test_listlbr_utf8.out \
test_qf_title.out \
+ test_changelist.out \
test_eval.out \
test_options.out
***************
*** 171,175 ****
--- 172,177 ----
test_listlbr.out: test_listlbr.in
test_listlbr_utf8.out: test_listlbr_utf8.in
test_qf_title.out: test_qf_title.in
+ test_changelist.out: test_changelist.in
test_eval.out: test_eval.in
test_options.out: test_options.in
*** ../vim-7.4.385/src/testdir/Make_dos.mak 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Make_dos.mak 2014-07-30 13:54:16.091608044 +0200
***************
*** 40,45 ****
--- 40,46 ----
test_listlbr.out \
test_listlbr_utf8.out \
test_qf_title.out \
+ test_changelist.out \
test_eval.out \
test_options.out
*** ../vim-7.4.385/src/testdir/Make_ming.mak 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Make_ming.mak 2014-07-30 13:54:19.775608018 +0200
***************
*** 60,65 ****
--- 60,66 ----
test_listlbr.out \
test_listlbr_utf8.out \
test_qf_title.out \
+ test_changelist.out \
test_eval.out \
test_options.out
*** ../vim-7.4.385/src/testdir/Make_os2.mak 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Make_os2.mak 2014-07-30 13:54:24.207607986 +0200
***************
*** 38,43 ****
--- 38,44 ----
test100.out test101.out test102.out test103.out test104.out \
test105.out test106.out test107.out \
test_autoformat_join.out \
+ test_changelist.out \
test_eval.out \
test_breakindent.out \
test_listlbr.out \
*** ../vim-7.4.385/src/testdir/Make_vms.mms 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Make_vms.mms 2014-07-30 13:54:31.151607936 +0200
***************
*** 4,10 ****
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2014 Jul 23
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
--- 4,10 ----
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
! # Last change: 2014 Jul 30
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
***************
*** 101,106 ****
--- 101,107 ----
test_listlbr.out \
test_listlbr_utf8.out \
test_qf_title.out \
+ test_changelist.out \
test_eval.out \
test_options.out
*** ../vim-7.4.385/src/testdir/Makefile 2014-07-23 15:54:43.443903036 +0200
--- src/testdir/Makefile 2014-07-30 13:54:45.291607834 +0200
***************
*** 38,43 ****
--- 38,44 ----
test_listlbr.out \
test_listlbr_utf8.out \
test_qf_title.out \
+ test_changelist.out \
test_eval.out \
test_options.out
*** ../vim-7.4.385/src/testdir/test_changelist.in 2014-07-30 14:04:27.507603650 +0200
--- src/testdir/test_changelist.in 2014-07-30 13:52:21.363608869 +0200
***************
*** 0 ****
--- 1,22 ----
+ Test changelist position after splitting window
+ Set 'undolevels' to make changelist for sourced file
+
+ STARTTEST
+ :so small.vim
+ Gkylp:set ul=100
+ Gylp:set ul=100
+ gg
+ :vsplit
+ :try
+ : normal g;
+ : normal ggVGcpass
+ :catch
+ : normal ggVGcfail
+ :finally
+ : %w! test.out
+ :endtry
+ :qa!
+ ENDTEST
+
+ 1
+ 2
*** ../vim-7.4.385/src/testdir/test_changelist.ok 2014-07-30 14:04:27.515603650 +0200
--- src/testdir/test_changelist.ok 2014-07-30 13:53:41.991608289 +0200
***************
*** 0 ****
--- 1 ----
+ pass
*** ../vim-7.4.385/src/version.c 2014-07-30 13:22:48.271621613 +0200
--- src/version.c 2014-07-30 13:56:49.951606938 +0200
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 386,
/**/
--
Our job was to build a computer information system for the branch banks. We
were the perfect people for the job: Dean had seen a computer once, and I had
heard Dean talk about it.
(Scott Adams - The Dilbert principle)
/// 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 ///
|
