# HG changeset patch # User Bram Moolenaar # Date 1608579905 -3600 # Node ID 10bbff53d3d18f80ef36bdf4fde36edf74028e84 # Parent 84eb22e3018c99233ae007e4a56ef6eae6423801 patch 8.2.2183: Vim9: value of 'edcompatible' and 'gdefault' are used Commit: https://github.com/vim/vim/commit/60f63100b9bc1d24b7b80c81f43cf2fc3da95987 Author: Bram Moolenaar Date: Mon Dec 21 20:32:43 2020 +0100 patch 8.2.2183: Vim9: value of 'edcompatible' and 'gdefault' are used Problem: Vim9: value of 'edcompatible' and 'gdefault' are used. Solution: Ignore these deprecated options in Vim9 script. (closes https://github.com/vim/vim/issues/7508) diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3778,6 +3778,15 @@ ex_substitute(exarg_T *eap) ++cmd; else { +#ifdef FEAT_EVAL + if (in_vim9script()) + { + // ignore 'gdefault' and 'edcompatible' + subflags.do_all = FALSE; + subflags.do_ask = FALSE; + } + else +#endif if (!p_ed) { if (p_gd) // default is global on diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -740,4 +740,17 @@ def Test_magic_not_used() bwipe! enddef +def Test_gdefault_not_used() + new + for cmd in ['set gdefault', 'set nogdefault'] + exe cmd + setline(1, 'aaa') + s/./b/ + assert_equal('baa', getline(1)) + endfor + + set nogdefault + bwipe! +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2183, +/**/ 2182, /**/ 2181,