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 fe2e94e258593d9bbb8abcfb9ff6f9b55d07511c..6da5046a45dffea6ad96bc65362f003996631725 100644 (file)
--- 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 585ff729f344619b8e5fa9e295804a8fac327234..0b3052c241ef5a8fb750d9c327be480fb76ec02c 100644 (file)
--- 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 285d9943642031d5edeeb2b505120e64b6c07fc0..e8f513a055891c7cf4d44370ed10e5482d54f8a4 100644 (file)
--- 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 509ef2222aacc8227ac43d3c8e8abf1340c7125e..f46bb4759442aa41607cbb60ebe1c8a0b41a6499 100644 (file)
--- 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,
 /**/