Regarding https://github.com/vim/vim/pull/14389#issuecomment-2043523974 , how about merging in the fixes from upstream for those stuck with a Vim version < 9.1.0276 ?