Skip to content

Commit 16abd99

Browse files
committed
patch 9.0.1676: warning for buffer in use when exiting early
Problem: Warning for buffer in use when exiting early. Solution: Change file names to be able to see what buffer is in use when exiting.
1 parent 7c2beb4 commit 16abd99

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

src/testdir/test_crypt.vim

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ endif
2222

2323
func Common_head_only(text)
2424
" This was crashing Vim
25-
split Xtest.txt
25+
split Xtest_head.txt
2626
call setline(1, a:text)
2727
wq
28-
call feedkeys(":split Xtest.txt\<CR>foobar\<CR>", "tx")
29-
call delete('Xtest.txt')
28+
call feedkeys(":split Xtest_head.txt\<CR>foobar\<CR>", "tx")
29+
call delete('Xtest_head.txt')
3030
call assert_match('VimCrypt', getline(1))
3131
bwipe!
3232
endfunc
@@ -49,7 +49,7 @@ func Crypt_uncrypt(method)
4949
" If the blowfish test fails 'cryptmethod' will be 'zip' now.
5050
call assert_equal(a:method, &cryptmethod)
5151

52-
split Xtest.txt
52+
split Xtest_uncrypt.txt
5353
let text =<< trim END
5454
01234567890123456789012345678901234567,
5555
line 2 foo bar blah,
@@ -60,11 +60,11 @@ func Crypt_uncrypt(method)
6060
call assert_equal('*****', &key)
6161
w!
6262
bwipe!
63-
call feedkeys(":split Xtest.txt\<CR>foobar\<CR>", 'xt')
63+
call feedkeys(":split Xtest_uncrypt.txt\<CR>foobar\<CR>", 'xt')
6464
call assert_equal(text, getline(1, 3))
6565
set key= cryptmethod&
6666
bwipe!
67-
call delete('Xtest.txt')
67+
call delete('Xtest_uncrypt.txt')
6868
endfunc
6969

7070
func Test_crypt_zip()
@@ -113,17 +113,17 @@ func Test_crypt_sodium_v2_startup()
113113
endfunc
114114

115115
func Uncrypt_stable(method, crypted_text, key, uncrypted_text)
116-
split Xtest.txt
116+
split Xtest_stable.txt
117117
set bin noeol key= fenc=latin1
118118
exe "set cryptmethod=" . a:method
119119
call setline(1, a:crypted_text)
120120
w!
121121
bwipe!
122122
set nobin
123-
call feedkeys(":split Xtest.txt\<CR>" . a:key . "\<CR>", 'xt')
123+
call feedkeys(":split Xtest_stable.txt\<CR>" . a:key . "\<CR>", 'xt')
124124
call assert_equal(a:uncrypted_text, getline(1, len(a:uncrypted_text)))
125125
bwipe!
126-
call delete('Xtest.txt')
126+
call delete('Xtest_stable.txt')
127127
set key=
128128
endfunc
129129

@@ -132,13 +132,13 @@ func Uncrypt_stable_xxd(method, hex, key, uncrypted_text, verbose)
132132
throw 'Skipped: xxd program missing'
133133
endif
134134
" use xxd to write the binary content
135-
call system(s:xxd_cmd .. ' -r >Xtest.txt', a:hex)
135+
call system(s:xxd_cmd .. ' -r >Xtest_stable_xxd.txt', a:hex)
136136
let cmd = (a:verbose ? ':verbose' : '') ..
137-
\ ":split Xtest.txt\<CR>" . a:key . "\<CR>"
137+
\ ":split Xtest_stable_xxd.txt\<CR>" . a:key . "\<CR>"
138138
call feedkeys(cmd, 'xt')
139139
call assert_equal(a:uncrypted_text, getline(1, len(a:uncrypted_text)))
140140
bwipe!
141-
call delete('Xtest.txt')
141+
call delete('Xtest_stable_xxd.txt')
142142
set key=
143143
endfunc
144144

@@ -354,7 +354,7 @@ endfunc
354354
func Test_crypt_key_mismatch()
355355
set cryptmethod=blowfish
356356

357-
split Xtest.txt
357+
split Xtest_mismatch.txt
358358
call setline(1, 'nothing')
359359
call feedkeys(":X\<CR>foobar\<CR>nothing\<CR>", 'xt')
360360
call assert_match("Keys don't match!", execute(':2messages'))

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1676,
698700
/**/
699701
1675,
700702
/**/

0 commit comments

Comments
 (0)