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
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0725
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.0725
Problem: Conceal mode is not completely tested.
Solution: Add tests for moving the cursor in Insert mode.
Files: src/testdir/test_conceal.vim,
src/testdir/dumps/Test_conceal_two_windows_10.dump,
src/testdir/dumps/Test_conceal_two_windows_11.dump,
src/testdir/dumps/Test_conceal_two_windows_12.dump,
src/testdir/dumps/Test_conceal_two_windows_13.dump
*** ../vim-8.1.0724/src/testdir/test_conceal.vim 2019-01-11 15:54:12.936039012 +0100
--- src/testdir/test_conceal.vim 2019-01-11 20:02:46.339421547 +0100
***************
*** 91,96 ****
--- 91,110 ----
call VerifyScreenDump(buf, 'Test_conceal_two_windows_09v', {})
call term_sendkeys(buf, "\<Esc>")
+ " Check moving the cursor while in insert mode.
+ call term_sendkeys(buf, ":set concealcursor=\r")
+ call term_sendkeys(buf, "a")
+ call VerifyScreenDump(buf, 'Test_conceal_two_windows_10', {})
+ call term_sendkeys(buf, "\<Down>")
+ call VerifyScreenDump(buf, 'Test_conceal_two_windows_11', {})
+ call term_sendkeys(buf, "\<Esc>")
+
+ " Check the "o" command
+ call VerifyScreenDump(buf, 'Test_conceal_two_windows_12', {})
+ call term_sendkeys(buf, "o")
+ call VerifyScreenDump(buf, 'Test_conceal_two_windows_13', {})
+ call term_sendkeys(buf, "\<Esc>")
+
" clean up
call StopVimInTerminal(buf)
call delete('XTest_conceal')
*** ../vim-8.1.0724/src/testdir/dumps/Test_conceal_two_windows_10.dump 2019-01-11 20:12:51.354918070 +0100
--- src/testdir/dumps/Test_conceal_two_windows_10.dump 2019-01-11 17:37:43.627513311 +0100
***************
*** 0 ****
--- 1,20 ----
+ |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ |S|e|c|o|n|d| |w|i|n|d|o|w| @61
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
+ |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1
+ |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62
*** ../vim-8.1.0724/src/testdir/dumps/Test_conceal_two_windows_11.dump 2019-01-11 20:12:51.354918070 +0100
--- src/testdir/dumps/Test_conceal_two_windows_11.dump 2019-01-11 17:37:44.679505186 +0100
***************
*** 0 ****
--- 1,20 ----
+ |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ |S|e|c|o|n|d| |w|i|n|d|o|w| @61
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
+ |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| |||h|i|d@1|e|n||> |t|h|r|e@1| @54
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|5| @10|A|l@1
+ |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62
*** ../vim-8.1.0724/src/testdir/dumps/Test_conceal_two_windows_12.dump 2019-01-11 20:12:51.358918039 +0100
--- src/testdir/dumps/Test_conceal_two_windows_12.dump 2019-01-11 20:03:24.431125384 +0100
***************
*** 0 ****
--- 1,20 ----
+ |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ |S|e|c|o|n|d| |w|i|n|d|o|w| @61
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
+ |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| |||h|i|d@1|e|n>|| |t|h|r|e@1| @54
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
+ | +0&&@74
*** ../vim-8.1.0724/src/testdir/dumps/Test_conceal_two_windows_13.dump 2019-01-11 20:12:51.362918012 +0100
--- src/testdir/dumps/Test_conceal_two_windows_13.dump 2019-01-11 20:03:25.483117238 +0100
***************
*** 0 ****
--- 1,20 ----
+ |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ |S|e|c|o|n|d| |w|i|n|d|o|w| @61
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1
+ |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55
+ |t|w|o| @1|h|e|r|e| @65
+ |t|h|r|e@1| @1|t|h|r|e@1| @62
+ > @74
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|4|,|1| @11|A|l@1
+ |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62
*** ../vim-8.1.0724/src/version.c 2019-01-11 19:19:40.685585822 +0100
--- src/version.c 2019-01-11 19:59:10.601152008 +0100
***************
*** 797,798 ****
--- 797,800 ----
{ /* Add new patch number below this line */
+ /**/
+ 725,
/**/
--
hundred-and-one symptoms of being an internet addict:
165. You have a web page burned into your glasses
/// 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 ///
|
