From c401a83520c57b1f3235efa3b4331cf4539b0947 Mon Sep 17 00:00:00 2001
From: glacambre <code@lacamb.re>
Date: Wed, 8 Jan 2025 18:36:01 +0100
Subject: [PATCH] Move FirenvimUIEnterAugroup creation to firenvim#run for
 #1660

This prevents issues with Vim.
---
 autoload/firenvim.vim | 6 ++++++
 plugin/firenvim.vim   | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/autoload/firenvim.vim b/autoload/firenvim.vim
index d0c41c3a..48d1b21b 100644
--- a/autoload/firenvim.vim
+++ b/autoload/firenvim.vim
@@ -243,6 +243,12 @@ function! firenvim#run() abort
                 endtry
                 call WriteStdout(a:id, l:response)
         endfunction
+        " #1660: only create the Firenvim augroup when firenvim#run has been
+        " called in order to prevent issues with Vim.
+        augroup FirenvimUIEnterAugroup
+                autocmd!
+                autocmd UIEnter * call firenvim#onUIEnter(deepcopy(v:event))
+        augroup END
         " g:firenvim_c might not exist for firenvim installations dating back
         " to 2021 and earlier.
         if exists('g:firenvim_c')
diff --git a/plugin/firenvim.vim b/plugin/firenvim.vim
index 03e3b8cd..ce35dca3 100644
--- a/plugin/firenvim.vim
+++ b/plugin/firenvim.vim
@@ -2,8 +2,3 @@ if exists('g:firenvim_loaded')
         finish
 endif
 let g:firenvim_loaded = 1
-
-augroup FirenvimUIEnterAugroup
-        autocmd!
-        autocmd UIEnter * call firenvim#onUIEnter(deepcopy(v:event))
-augroup END