Patch 8.2.0672

[Bram Moolenaar]

Patch 8.2.0672
Problem: Heredoc in scripts does not accept lower case marker.
Solution: Allow lower case only in non-Vim scripts. (Ken Takata,
closes #6019)
Files: src/evalvars.c, src/testdir/test_lua.vim,
src/testdir/test_perl.vim, src/testdir/test_python2.vim,
src/testdir/test_python3.vim, src/testdir/test_pyx2.vim,
src/testdir/test_pyx3.vim, src/testdir/test_ruby.vim


*** ../vim-8.2.0671/src/evalvars.c 2020-04-24 20:56:55.934731134 +0200
--- src/evalvars.c 2020-05-01 13:54:09.439208178 +0200
***************
*** 595,601 ****
return NULL;
}
*p = NUL;
! if (vim_islower(*marker))
{
emsg(_("E221: Marker cannot start with lower case letter"));
return NULL;
--- 595,601 ----
return NULL;
}
*p = NUL;
! if (!script_get && vim_islower(*marker))
{
emsg(_("E221: Marker cannot start with lower case letter"));
return NULL;
*** ../vim-8.2.0671/src/testdir/test_lua.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_lua.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 623,629 ****
lua << trim
vim.command('let s ..= "D"')
.
! call assert_equal('ABCD', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 623,632 ----
lua << trim
vim.command('let s ..= "D"')
.
! lua << trim eof
! vim.command('let s ..= "E"')
! eof
! call assert_equal('ABCDE', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_perl.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_perl.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 305,311 ****
perl << trim
VIM::DoCommand('let s ..= "D"')
.
! call assert_equal('ABCD', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 305,314 ----
perl << trim
VIM::DoCommand('let s ..= "D"')
.
! perl << trim eof
! VIM::DoCommand('let s ..= "E"')
! eof
! call assert_equal('ABCDE', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_python2.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_python2.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 182,188 ****
python << trim
s+='D'
.
! call assert_equal('ABCD', pyxeval('s'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 182,191 ----
python << trim
s+='D'
.
! python << trim eof
! s+='E'
! eof
! call assert_equal('ABCDE', pyxeval('s'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_python3.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_python3.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 349,355 ****
python3 << trim
s+='D'
.
! call assert_equal('ABCD', pyxeval('s'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 349,358 ----
python3 << trim
s+='D'
.
! python3 << trim eof
! s+='E'
! eof
! call assert_equal('ABCDE', pyxeval('s'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_pyx2.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_pyx2.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 94,100 ****
pyx << trim
result+='D'
.
! call assert_equal('ABCD', pyxeval('result'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 94,103 ----
pyx << trim
result+='D'
.
! pyx << trim eof
! result+='E'
! eof
! call assert_equal('ABCDE', pyxeval('result'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_pyx3.vim 2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_pyx3.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 94,100 ****
pyx << trim
result+='D'
.
! call assert_equal('ABCD', pyxeval('result'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 94,103 ----
pyx << trim
result+='D'
.
! pyx << trim eof
! result+='E'
! eof
! call assert_equal('ABCDE', pyxeval('result'))
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/testdir/test_ruby.vim 2020-04-30 19:19:25.816908787 +0200
--- src/testdir/test_ruby.vim 2020-05-01 13:54:09.439208178 +0200
***************
*** 409,415 ****
ruby << trim
Vim.command('let s ..= "D"')
.
! call assert_equal('ABCD', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
--- 409,418 ----
ruby << trim
Vim.command('let s ..= "D"')
.
! ruby << trim eof
! Vim.command('let s ..= "E"')
! eof
! call assert_equal('ABCDE', s)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.0671/src/version.c 2020-04-30 22:50:55.605076816 +0200
--- src/version.c 2020-05-01 13:55:46.502996566 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 672,
/**/

--
To define recursion, we must first define recursion.

/// Bram Moolenaar -- Br...@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 ///