summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-17 21:41:35 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-17 21:41:35 +0200
commit40a019f157c549dcdc17c33f082975485567bb06 (patch)
treea69ca826b3d6eb9757a8c3006e5b7c526c9242c7
parente17f8817a1713a1ef20257c777a483b7ab57a841 (diff)
downloadvim-git-40a019f157c549dcdc17c33f082975485567bb06.tar.gz
patch 8.2.0996: using "aucmdwin" in win_gettype() is not idealv8.2.0996
Problem: Using "aucmdwin" in win_gettype() is not ideal. Solution: Rename to "autocmd".
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--src/evalwindow.c2
-rw-r--r--src/testdir/test_autocmd.vim2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fe2e94e25..6da5046a4 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 585ff729f..0b3052c24 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 285d99436..e8f513a05 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 509ef2222..f46bb4759 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 996,
+/**/
995,
/**/
994,