martin/emacs-doom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patches: fix 0008 hunk headers and context mismatches

Browse Source 
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.
This commit is contained in:
Daneel
2026-03-04 14:13:55 +01:00
parent d5b5d5301d
commit f78da08e6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch
View File

@@ -415,8 +415,8 @@ index c9fe93a57b..f7574efb39 100644
{ {
@@ -9243,6 +9396,11 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b @@ -9243,6 +9396,11 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
block_input ();
specpdl_ref count2 = SPECPDL_INDEX (); specpdl_ref count2 = SPECPDL_INDEX ();
block_input ();
+ /* Register unblock_input as an unwind action so that if any Lisp + /* Register unblock_input as an unwind action so that if any Lisp
+ call below signals (triggering a longjmp through unbind_to), + call below signals (triggering a longjmp through unbind_to),
+ block_input is always paired with an unblock_input. The + block_input is always paired with an unblock_input. The
@@ -839,7 +839,7 @@ index c9fe93a57b..f7574efb39 100644
- (void)postAccessibilityUpdates - (void)postAccessibilityUpdates
{ {
NSTRACE ("[EmacsView postAccessibilityUpdates]"); NSTRACE ("[EmacsView postAccessibilityUpdates]");
@@ -12823,14 +13182,71 @@ - (void)postAccessibilityUpdates @@ -12823,11 +13182,69 @@ - (void)postAccessibilityUpdates
/* Re-entrance guard: VoiceOver callbacks during notification posting /* Re-entrance guard: VoiceOver callbacks during notification posting
can trigger redisplay, which calls ns_update_end, which calls us can trigger redisplay, which calls ns_update_end, which calls us