fix: update last cursor on first CursorMoved (#16698)

mjlbach · web-flow · commit b42e0c40c8b8 · 2021-12-18T19:18:47.000-08:00
Closes #16625 #12923 The first defined CursorMoved autocommand will immediately fire if the cursor has previously moved upon definition of the autocommand. Plugins add dummy autocommands such as: ```lua autocmd CursorMoved * execute '' ``` to avoid this behavior. Instead, when defining a new CursorHold autocommand, force update the last cursor position. See vim/vim#2053
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
@@ -932,6 +932,12 @@ static int do_autocmd_event(event_T event, char_u *pat, bool once, int nested, c
           last_mode = get_mode();
         }
 
+        //  If the event is CursorMoved, update the last cursor position
+        //  position to avoid immediately triggering the autocommand
+        if (event == EVENT_CURSORMOVED && !has_event(EVENT_CURSORMOVED)) {
+          curwin->w_last_cursormoved = curwin->w_cursor;
+        }
+
         ap->cmds = NULL;
         *prev_ap = ap;
         last_autopat[(int)event] = ap;
diff --git a/test/functional/autocmd/cursormoved_spec.lua b/test/functional/autocmd/cursormoved_spec.lua
@@ -31,4 +31,12 @@ describe('CursorMoved', function()
     eq({'aaa'}, funcs.nvim_buf_get_lines(eval('g:buf'), 0, -1, true))
     eq(0, eval('g:cursormoved'))
   end)
+
+  it("is not triggered by cursor movement prior to first CursorMoved instantiation", function()
+    source([[
+    let g:cursormoved = 0
+    autocmd CursorMoved * let g:cursormoved += 1
+    ]])
+    eq(0, eval('g:cursormoved'))
+  end)
 end)
