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

Fix patch 0008: shift nsterm.m hunk line numbers by +4

Browse Source 
Adding 4 lines in patch 0003 (punctuation trim fix) shifted all
subsequent nsterm.m positions by 4.  Update the @@ -NNNN offsets
for all 14 nsterm.m hunks at line >= 9060 in patch 0008.
This commit is contained in:
Daneel
2026-03-02 11:37:09 +01:00
parent 6ea5ae8a90
commit 9700d0643d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,7 @@ index 8d44b5f..29b646d 100644
specpdl_ref count = SPECPDL_INDEX ();
record_unwind_current_buffer ();
/* Ensure block_input is always matched by unblock_input even if
@@ -9060,11 +9192,13 @@ - (void)postFocusedCursorNotification:(ptrdiff_t)point
@@ -9064,11 +9196,13 @@ - (void)postFocusedCursorNotification:(ptrdiff_t)point
= @(ns_ax_text_state_change_selection_move);
moveInfo[@"AXTextSelectionDirection"] = @(direction);
moveInfo[@"AXTextChangeElement"] = self;
@@ -404,7 +404,7 @@ index 8d44b5f..29b646d 100644
moveInfo[@"AXTextSelectionGranularity"] = @(granularity);
ns_ax_post_notification_with_info (
@@ -9107,12 +9241,17 @@ derive its own speech (it would read the wrong character
@@ -9111,12 +9245,17 @@ derive its own speech (it would read the wrong character
}
}
@@ -427,7 +427,7 @@ index 8d44b5f..29b646d 100644
if (cachedText
&& granularity == ns_ax_text_selection_granularity_line)
{
@@ -9175,7 +9314,14 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
@@ -9179,7 +9318,14 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
ptrdiff_t currentOverlayStart = 0;
ptrdiff_t currentOverlayEnd = 0;
@@ -442,7 +442,7 @@ index 8d44b5f..29b646d 100644
record_unwind_current_buffer ();
if (b != current_buffer)
set_buffer_internal_1 (b);
@@ -9352,12 +9498,29 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
@@ -9356,12 +9502,29 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
if (!b)
return;
@@ -472,7 +472,7 @@ index 8d44b5f..29b646d 100644
if (modiff != self.cachedModiff)
{
self.cachedModiff = modiff;
@@ -9371,6 +9534,7 @@ Text property changes (e.g. face updates from
@@ -9375,6 +9538,7 @@ Text property changes (e.g. face updates from
{
self.cachedCharsModiff = chars_modiff;
[self postTextChangedNotification:point];
@@ -480,7 +480,7 @@ index 8d44b5f..29b646d 100644
}
}
@@ -9393,8 +9557,15 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
@@ -9397,8 +9561,15 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
displayed in the minibuffer. In normal editing buffers,
font-lock and other modes change BUF_OVERLAY_MODIFF on
every redisplay, triggering O(overlays) work per keystroke.
@@ -498,7 +498,7 @@ index 8d44b5f..29b646d 100644
goto skip_overlay_scan;
int selected_line = -1;
@@ -9440,7 +9611,18 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
@@ -9444,7 +9615,18 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
self.cachedPoint = point;
self.cachedMarkActive = markActive;
@@ -518,7 +518,7 @@ index 8d44b5f..29b646d 100644
NSInteger direction = ns_ax_text_selection_direction_discontiguous;
if (point > oldPoint)
direction = ns_ax_text_selection_direction_next;
@@ -9488,6 +9670,36 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
@@ -9492,6 +9674,36 @@ frameworks like Vertico bump BOTH BUF_MODIFF (via text property
granularity = ns_ax_text_selection_granularity_line;
}
@@ -555,7 +555,7 @@ index 8d44b5f..29b646d 100644
/* Post notifications for focused and non-focused elements. */
if ([self isAccessibilityFocused])
[self postFocusedCursorNotification:point
@@ -9630,6 +9832,17 @@ - (NSRect)accessibilityFrame
@@ -9634,6 +9836,17 @@ - (NSRect)accessibilityFrame
if (vis_start >= vis_end)
return @[];
@@ -573,7 +573,7 @@ index 8d44b5f..29b646d 100644
/* Symbols are interned once at startup via DEFSYM in syms_of_nsterm;
reference them directly here (GC-safe, no repeated obarray lookup). */
@@ -9750,6 +9963,7 @@ than O(chars). Fall back to pos+1 as safety net. */
@@ -9754,6 +9967,7 @@ than O(chars). Fall back to pos+1 as safety net. */
pos = span_end;
}
@@ -581,7 +581,7 @@ index 8d44b5f..29b646d 100644
return [[spans copy] autorelease];
}
@@ -9931,6 +10145,10 @@ - (void)dealloc
@@ -9935,6 +10149,10 @@ - (void)dealloc
#endif
[accessibilityElements release];
@@ -592,7 +592,7 @@ index 8d44b5f..29b646d 100644
[[self menu] release];
[super dealloc];
}
@@ -11380,6 +11598,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
@@ -11384,6 +11602,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
windowClosing = NO;
processingCompose = NO;
@@ -602,7 +602,7 @@ index 8d44b5f..29b646d 100644
scrollbarsNeedingUpdate = 0;
fs_state = FULLSCREEN_NONE;
fs_before_fs = next_maximized = -1;
@@ -12688,6 +12909,154 @@ - (id)accessibilityFocusedUIElement
@@ -12692,6 +12913,154 @@ - (id)accessibilityFocusedUIElement
The existing elements carry cached state (modiff, point) from the
previous redisplay cycle. Rebuilding first would create fresh
elements with current values, making change detection impossible. */
@@ -757,7 +757,7 @@ index 8d44b5f..29b646d 100644
- (void)postAccessibilityUpdates
{
NSTRACE ("[EmacsView postAccessibilityUpdates]");
@@ -12698,11 +13065,64 @@ - (void)postAccessibilityUpdates
@@ -12702,11 +13069,64 @@ - (void)postAccessibilityUpdates
/* Re-entrance guard: VoiceOver callbacks during notification posting
can trigger redisplay, which calls ns_update_end, which calls us