aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-11-25 02:43:23 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-11-25 02:46:20 -0500
commit8d7fa8962bce98936cf9ddcefd70f35e7db04239 (patch)
tree079bb777301cb062538b2cda714b44104c529c18
parent9b2efe6b7d40d6ef317751768a65c74e4e2e8152 (diff)
downloadrneovim-8d7fa8962bce98936cf9ddcefd70f35e7db04239.tar.gz
rneovim-8d7fa8962bce98936cf9ddcefd70f35e7db04239.tar.bz2
rneovim-8d7fa8962bce98936cf9ddcefd70f35e7db04239.zip
vim-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". https://github.com/vim/vim/commit/40a019f157c549dcdc17c33f082975485567bb06
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--src/nvim/eval/funcs.c2
-rw-r--r--src/nvim/testdir/test_autocmd.vim2
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 57d9eb5b43..343e35bf66 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9280,7 +9280,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/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index d07efc297e..901f20bedf 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -11007,7 +11007,7 @@ static void f_win_gettype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
}
if (wp == aucmd_win) {
- rettv->vval.v_string = vim_strsave((char_u *)"aucmdwin");
+ rettv->vval.v_string = vim_strsave((char_u *)"autocmd");
} else if (wp->w_p_pvw) {
rettv->vval.v_string = vim_strsave((char_u *)"preview");
} else if (wp->w_floating) {
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index a2695ec354..1fa7eeaea0 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -1947,7 +1947,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!