From f78da08e6bc765a6a371f202a66b6710b2dd32a6 Mon Sep 17 00:00:00 2001 From: Daneel Date: Wed, 4 Mar 2026 14:13:55 +0100 Subject: [PATCH] patches: fix 0008 hunk headers and context mismatches Two applicability fixes: - Last hunk (@@ -12823): header said old=14 new=71 but actual content (before the -- 2.43.0 footer) is old=11 new=69. Correct the counts. - Hunk @@ -9243: context showed block_input before specpdl_ref count2, but patch 0003 introduces them with specpdl_ref first. Swap context lines to match actual post-0003 state. Verified: git am applies all 9 patches cleanly on Emacs f8d9ecb. --- ...ns-announce-child-frame-completion-candidates-for-Vo.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch index edf419e..9b27f75 100644 --- a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch +++ b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch @@ -415,8 +415,8 @@ index c9fe93a57b..f7574efb39 100644 { @@ -9243,6 +9396,11 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b - block_input (); specpdl_ref count2 = SPECPDL_INDEX (); + block_input (); + /* Register unblock_input as an unwind action so that if any Lisp + call below signals (triggering a longjmp through unbind_to), + block_input is always paired with an unblock_input. The @@ -839,7 +839,7 @@ index c9fe93a57b..f7574efb39 100644 - (void)postAccessibilityUpdates { NSTRACE ("[EmacsView postAccessibilityUpdates]"); -@@ -12823,14 +13182,71 @@ - (void)postAccessibilityUpdates +@@ -12823,11 +13182,69 @@ - (void)postAccessibilityUpdates /* Re-entrance guard: VoiceOver callbacks during notification posting can trigger redisplay, which calls ns_update_end, which calls us