event-loop: do not set CA_COMMAND_BUSY #9853

justinmk · web-flow · commit 943bedfc86ab · 2019-04-08T02:33:00.000+02:00
CA_COMMAND_BUSY in nv_event() was carried over from Vim nv_cursorhold() (ref: e5165ba). It prevents :startinsert from working during a RPC call, so remove it. Helped-by: glacambre <me@r4> closes #7254
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
@@ -8001,7 +8001,6 @@ static void nv_event(cmdarg_T *cap)
   // lists or dicts being used.
   may_garbage_collect = false;
   multiqueue_process_events(main_loop.events);
-  cap->retval |= CA_COMMAND_BUSY;       // don't call edit() now
   finish_op = false;
 }
 
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
@@ -56,6 +56,13 @@ describe('API', function()
     eq(2, eval('1+1'))
   end)
 
+  it('does not set CA_COMMAND_BUSY #7254', function()
+    nvim('command', 'split')
+    nvim('command', 'autocmd WinEnter * startinsert')
+    nvim('command', 'wincmd w')
+    eq({mode='i', blocking=false}, nvim("get_mode"))
+  end)
+
   describe('nvim_command', function()
     it('works', function()
       local fname = helpers.tmpname()
@@ -83,7 +90,7 @@ describe('API', function()
     end)
 
     it('VimL execution error: fails with specific error', function()
-      local status, rv = pcall(nvim, "command_output", "buffer 23487")
+      local status, rv = pcall(nvim, "command", "buffer 23487")
       eq(false, status)                 -- nvim_command() failed.
       eq("E86: Buffer 23487 does not exist", string.match(rv, "E%d*:.*"))
       eq('', eval('v:errmsg'))  -- v:errmsg was not updated.

Original file line number	Diff line number	Diff line change
`@@ -8001,7 +8001,6 @@ static void nv_event(cmdarg_T *cap)`
`8001`	`8001`	`// lists or dicts being used.`
`8002`	`8002`	`may_garbage_collect = false;`
`8003`	`8003`	`multiqueue_process_events(main_loop.events);`
`8004`		`- cap->retval \|= CA_COMMAND_BUSY; // don't call edit() now`
`8005`	`8004`	`finish_op = false;`
`8006`	`8005`	`}`
`8007`	`8006`