From d5b5d5301d0280844539a409806162b4fb16f537 Mon Sep 17 00:00:00 2001 From: Daneel Date: Wed, 4 Mar 2026 14:05:44 +0100 Subject: [PATCH] patches: fix 0004 hunk context for accessibilityRangeForPosition: Patch 0002 introduces accessibilityRangeForPosition: with the correct block_input-before-record_unwind ordering. Patch 0004 was trying to fix the ordering again (expecting wrong-order context), causing git am to fail at 0005 with 'patch does not apply'. Fix: remove the ordering swap from the 0004 hunk; retain only the comment improvement. The context now correctly reflects the state after 0002 applies (block_input followed by record_unwind_protect_void). --- ...4-ns-add-interactive-span-elements-for-Tab-navigation.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patches/0004-ns-add-interactive-span-elements-for-Tab-navigation.patch b/patches/0004-ns-add-interactive-span-elements-for-Tab-navigation.patch index 8fd4485..29f97fd 100644 --- a/patches/0004-ns-add-interactive-span-elements-for-Tab-navigation.patch +++ b/patches/0004-ns-add-interactive-span-elements-for-Tab-navigation.patch @@ -32,9 +32,8 @@ index 16343f978a..f5e5cea074 100644 + record_unwind_protect_void (unblock_input) so that the unwind + handler is never called without a matching block_input. */ specpdl_ref count = SPECPDL_INDEX (); -- record_unwind_protect_void (unblock_input); block_input (); -+ record_unwind_protect_void (unblock_input); + record_unwind_protect_void (unblock_input); /* Find the glyph row at this y coordinate. */ struct glyph_matrix *matrix = w->current_matrix;