Patch 8.2.2017

[Bram Moolenaar]

Patch 8.2.2017 (after 8.2.2015)
Problem: Missing part of the dict change.
Solution: Also change the script level dict.
Files: src/dict.c


*** ../vim-8.2.2016/src/dict.c 2020-11-05 20:50:45.331984998 +0100
--- src/dict.c 2020-11-18 21:53:58.353302123 +0100
***************
*** 111,116 ****
--- 111,117 ----

/*
* Clear hashtab "ht" and dict items it contains.
+ * If "ht" is not freed then you should call hash_init() next!
*/
void
hashtab_free_contents(hashtab_T *ht)
***************
*** 850,859 ****
*arg = skipwhite_and_linebreak(*arg + 1, evalarg);
while (**arg != '}' && **arg != NUL)
{
! if ((literal
! ? get_literal_key(arg, &tvkey)
! : eval1(arg, &tvkey, evalarg)) == FAIL) // recursive!
! goto failret;

// the colon should come right after the key, but this wasn't checked
// previously, so only require it in Vim9 script.
--- 851,882 ----
*arg = skipwhite_and_linebreak(*arg + 1, evalarg);
while (**arg != '}' && **arg != NUL)
{
! char_u *p = to_name_end(*arg, FALSE);
!
! if (literal || (vim9script && *p == ':'))
! {
! if (get_literal_key(arg, &tvkey) == FAIL)
! goto failret;
! }
! else
! {
! int has_bracket = vim9script && **arg == '[';
!
! if (has_bracket)
! *arg = skipwhite(*arg + 1);
! if (eval1(arg, &tvkey, evalarg) == FAIL) // recursive!
! goto failret;
! if (has_bracket)
! {
! *arg = skipwhite(*arg);
! if (**arg != ']')
! {
! emsg(_(e_missing_matching_bracket_after_dict_key));
! return FAIL;
! }
! ++*arg;
! }
! }

// the colon should come right after the key, but this wasn't checked
// previously, so only require it in Vim9 script.
*** ../vim-8.2.2016/src/version.c 2020-11-19 18:57:20.019638274 +0100
--- src/version.c 2020-11-19 19:01:25.382650104 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2017,
/**/

--
Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95"
Windows 95: "Press CTRL-ALT-DEL to reboot"
Windows NT 4.0: "Press CTRL-ALT-DEL to login"

/// 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 ///