From 570a8da01b55c3aad1f057be236f55ccf82ed8af Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 5 Jan 2025 11:31:39 -0800
Subject: fix(health): "q" should not close last window #31876

---
 runtime/lua/vim/health.lua | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/health.lua b/runtime/lua/vim/health.lua
index ebad000c5b..01166628b1 100644
--- a/runtime/lua/vim/health.lua
+++ b/runtime/lua/vim/health.lua
@@ -409,13 +409,12 @@ function M._check(mods, plugin_names)
   vim.print('')
 
   -- Quit with 'q' inside healthcheck buffers.
-  vim.api.nvim_buf_set_keymap(
-    bufnr,
-    'n',
-    'q',
-    '<c-w>q',
-    { silent = true, noremap = true, nowait = true }
-  )
+  vim.keymap.set('n', 'q', function()
+    local ok, _ = pcall(vim.cmd.close)
+    if not ok then
+      vim.cmd.bdelete()
+    end
+  end, { buffer = bufnr, silent = true, noremap = true, nowait = true })
 
   -- Once we're done writing checks, set nomodifiable.
   vim.bo[bufnr].modifiable = false
-- 
cgit