From: Bram Moolenaar Date: Wed, 17 Jun 2020 19:41:35 +0000 (+0200) Subject: patch 8.2.0996: using "aucmdwin" in win_gettype() is not ideal X-Git-Tag: v8.2.0996 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40a019f157c549dcdc17c33f082975485567bb06;p=thirdparty%2Fvim.git patch 8.2.0996: using "aucmdwin" in win_gettype() is not ideal Problem: Using "aucmdwin" in win_gettype() is not ideal. Solution: Rename to "autocmd". --- diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index fe2e94e258..6da5046a45 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -10864,7 +10864,7 @@ win_getid([{win} [, {tab}]]) *win_getid()* win_gettype([{nr}]) *win_gettype()* Return the type of the window: - "aucmdwin" autocommand window. Temporary window + "autocmd" autocommand window. Temporary window used to execute autocommands. "popup" popup window |popup| "preview" preview window |preview-window| diff --git a/src/evalwindow.c b/src/evalwindow.c index 585ff729f3..0b3052c241 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -859,7 +859,7 @@ f_win_gettype(typval_T *argvars, typval_T *rettv) } } if (wp == aucmd_win) - rettv->vval.v_string = vim_strsave((char_u *)"aucmdwin"); + rettv->vval.v_string = vim_strsave((char_u *)"autocmd"); #if defined(FEAT_QUICKFIX) else if (wp->w_p_pvw) rettv->vval.v_string = vim_strsave((char_u *)"preview"); diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 285d994364..e8f513a055 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2592,7 +2592,7 @@ func Test_autocmd_window() augroup END doautoall BufEnter - call assert_equal([['one.txt', 'aucmdwin'], ['two.txt', '']], g:blist) + call assert_equal([['one.txt', 'autocmd'], ['two.txt', '']], g:blist) augroup aucmd_win_test au! diff --git a/src/version.c b/src/version.c index 509ef2222a..f46bb47594 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 996, /**/ 995, /**/