From ed9abb1851e31b98b79b1b06eef5ceeccdbb7372 Mon Sep 17 00:00:00 2001
From: €šm̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰̰�Ř§Ů Â£╟©舐æØ¢£ðsÞ¥¿—
 <memchr@proton.me>
Date: Tue, 9 Dec 2025 03:22:10 +0000
Subject: fix(exrc): ensure consistent 'exrc' loading sequence #35148

Problem:
The execution of startup scripts in parent directories are too late
compared to scripts in current direcctory.

Solution:
Execute all startup scripts with `lua/_core/exrc.lua`.

closes: #35147
---
 runtime/lua/vim/_core/exrc.lua | 19 +++++++++++++++++++
 runtime/lua/vim/_defaults.lua  | 31 -------------------------------
 2 files changed, 19 insertions(+), 31 deletions(-)
 create mode 100644 runtime/lua/vim/_core/exrc.lua

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/_core/exrc.lua b/runtime/lua/vim/_core/exrc.lua
new file mode 100644
index 0000000000..2fa586933b
--- /dev/null
+++ b/runtime/lua/vim/_core/exrc.lua
@@ -0,0 +1,19 @@
+local files = vim.fs.find({ '.nvim.lua', '.nvimrc', '.exrc' }, {
+  type = 'file',
+  upward = true,
+  limit = math.huge,
+})
+for _, file in ipairs(files) do
+  local trusted = vim.secure.read(file) --[[@as string|nil]]
+  if trusted then
+    if vim.endswith(file, '.lua') then
+      assert(loadstring(trusted, '@' .. file))()
+    else
+      vim.api.nvim_exec2(trusted, {})
+    end
+  end
+  -- If the user unset 'exrc' in the current exrc then stop searching
+  if not vim.o.exrc then
+    break
+  end
+end
diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index fa898719d6..e7d7735029 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -952,37 +952,6 @@ do
     end
   end
 
-  vim.api.nvim_create_autocmd('VimEnter', {
-    group = vim.api.nvim_create_augroup('nvim.exrc', {}),
-    desc = 'Find exrc files in parent directories',
-    callback = function()
-      if not vim.o.exrc then
-        return
-      end
-      local files = vim.fs.find({ '.nvim.lua', '.nvimrc', '.exrc' }, {
-        type = 'file',
-        upward = true,
-        limit = math.huge,
-        -- exrc in cwd already handled from C, thus start in parent directory.
-        path = vim.fs.dirname((vim.uv.cwd())),
-      })
-      for _, file in ipairs(files) do
-        local trusted = vim.secure.read(file) --[[@as string|nil]]
-        if trusted then
-          if vim.endswith(file, '.lua') then
-            assert(loadstring(trusted, '@' .. file))()
-          else
-            vim.api.nvim_exec2(trusted, {})
-          end
-        end
-        -- If the user unset 'exrc' in the current exrc then stop searching
-        if not vim.o.exrc then
-          return
-        end
-      end
-    end,
-  })
-
   if tty then
     -- Show progress bars in supporting terminals
     vim.api.nvim_create_autocmd('Progress', {
-- 
cgit