commit 1473551a4457d4920b235eeeb9f279e196ee7225
author Bram Moolenaar <Bram@vim.org> Sat Mar 26 21:00:08 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 26 21:00:08 2016 +0100
tree bd0515b263f9f2ea82effe2ef09073512078e838
parent 8fdd7210479f0c486822ad8934087b4bfd8a4765

patch 7.4.1658
Problem:    A plugin does not know when VimEnter autocommands were already
            triggered.
Solution:   Add the v:vim_did_enter variable.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 06f3585..c104695 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -372,6 +372,7 @@
     {VV_NAME("true",		 VAR_SPECIAL), VV_RO},
     {VV_NAME("null",		 VAR_SPECIAL), VV_RO},
     {VV_NAME("none",		 VAR_SPECIAL), VV_RO},
+    {VV_NAME("vim_did_enter",	 VAR_NUMBER), VV_RO},
 };
 
 /* shorthand */

src/main.c

diff --git a/src/main.c b/src/main.c
index 35c940f..91ef66d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -969,6 +969,9 @@
     if (p_im)
 	need_start_insertmode = TRUE;
 
+#ifdef FEAT_EVAL
+    set_vim_var_nr(VV_VIM_DID_ENTER, 1L);
+#endif
 #ifdef FEAT_AUTOCMD
     apply_autocmds(EVENT_VIMENTER, NULL, NULL, FALSE, curbuf);
     TIME_MSG("VimEnter autocommands");

src/testdir/test_alot.vim

diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index fcf358b..0630998 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -2,6 +2,7 @@
 " This makes testing go faster, since Vim doesn't need to restart.
 
 source test_assign.vim
+source test_autocmd.vim
 source test_cursor_func.vim
 source test_delete.vim
 source test_ex_undo.vim

src/testdir/test_autocmd.vim

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
new file mode 100644
index 0000000..12c9848
--- /dev/null
+++ b/src/testdir/test_autocmd.vim
@@ -0,0 +1,8 @@
+" Tests for autocommands
+
+func Test_vim_did_enter()
+  call assert_false(v:vim_did_enter)
+
+  " This script will never reach the main loop, can't check if v:vim_did_enter
+  " becomes one.
+endfunc

src/version.c

diff --git a/src/version.c b/src/version.c
index 6459356..62e66ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1658,
+/**/
     1657,
 /**/
     1656,

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index a7443e9..a2dc079 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1869,7 +1869,8 @@
 #define VV_TRUE		64
 #define VV_NULL		65
 #define VV_NONE		66
-#define VV_LEN		67	/* number of v: vars */
+#define VV_VIM_DID_ENTER 67
+#define VV_LEN		68	/* number of v: vars */
 
 /* used for v_number in VAR_SPECIAL */
 #define VVAL_FALSE	0L