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

patches: fix leftover conflict markers in patch 0002

Browse Source
This commit is contained in:
Daneel
2026-03-01 09:17:45 +01:00
parent 0c13f5d6a3
commit e0343db56c
7 changed files with 47 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/0002-ns-implement-buffer-accessibility-element-core-proto.patch
View File

@@ -1,4 +1,4 @@
From a0c39d23ba91ee2e6a80f58ac263513326d3653c Mon Sep 17 00:00:00 2001
From 77ba59fea45fca76430d2aafbf79dc7e31ac0041 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 2/8] ns: implement buffer accessibility element (core
@@ -18,14 +18,14 @@ setAccessibilityFocused.
Tested on macOS 14 with VoiceOver. Verified: buffer reading,
line-by-line navigation, word/character announcements.
---
src/nsterm.m | 1128 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 1128 insertions(+)
src/nsterm.m | 1123 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 1123 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index e516946..999ca0d 100644
index e516946..cfd0715 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7614,6 +7614,1134 @@ - (id)accessibilityTopLevelUIElement
@@ -7614,6 +7614,1129 @@ - (id)accessibilityTopLevelUIElement
@end
@@ -474,10 +474,6 @@ index e516946..999ca0d 100644
+ lo = mid + 1;
+ else
+ {
+<<<<<<< Updated upstream
+ /* Found: charpos is inside this run. Compute UTF-16 delta
+ directly from cachedText — no Lisp calls needed. */
+=======
+ /* Found: charpos is inside this run. Compute UTF-16 delta.
+ Fast path for pure-ASCII runs (ax_length == length): every
+ Emacs charpos maps to exactly one UTF-16 code unit, so the
@@ -487,7 +483,6 @@ index e516946..999ca0d 100644
+ cost per frame even when the buffer is unchanged.
+ Multi-byte runs fall through to the sequence walk, bounded
+ by run length (visible window), not total buffer size. */
+>>>>>>> Stashed changes
+ NSUInteger chars_in = (NSUInteger)(charpos - r->charpos);
+ if (chars_in == 0)
+ return r->ax_start;

6
patches/0003-ns-add-buffer-notification-dispatch-and-mode-line-el.patch
View File

@@ -1,4 +1,4 @@
From 683ddf23e2a4d4c981d2947d475f2c02a41ce66b Mon Sep 17 00:00:00 2001
From df8710e72d6d988b86079d2eec624fd5bde23b71 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 3/8] ns: add buffer notification dispatch and mode-line
@@ -24,10 +24,10 @@ region selection feedback, completion popups, mode-line reading.
1 file changed, 545 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index 999ca0d..239666d 100644
index cfd0715..fee3e49 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8742,6 +8742,551 @@ - (NSRect)accessibilityFrame
@@ -8737,6 +8737,551 @@ - (NSRect)accessibilityFrame
@end

6
patches/0004-ns-add-interactive-span-elements-for-Tab-navigation.patch
View File

@@ -1,4 +1,4 @@
From 78b8d79ec5505165d6864cc65c7b3703a57e441c Mon Sep 17 00:00:00 2001
From e73e311a95d86d6e88a78185aab42ca65b65e066 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 4/8] ns: add interactive span elements for Tab navigation
@@ -17,10 +17,10 @@ Tested on macOS 14. Verified: Tab-cycling through org-mode links,
1 file changed, 286 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index 239666d..94a4602 100644
index fee3e49..8c26e27 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9287,6 +9287,292 @@ - (NSRect)accessibilityFrame
@@ -9282,6 +9282,292 @@ - (NSRect)accessibilityFrame
@end

16
patches/0005-ns-integrate-accessibility-with-EmacsView-and-redisp.patch
View File

@@ -1,4 +1,4 @@
From 7aab25d3ba9b41d3d81693b04d8d74812cad9139 Mon Sep 17 00:00:00 2001
From 6f37c729a3646dc0ac4c68825edac8f6a81cd9ec Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 5/8] ns: integrate accessibility with EmacsView and redisplay
@@ -51,7 +51,7 @@ index 80661a9..2b1f9e6 100644
** Re-introduced dictation, lost in Emacs v30 (macOS).
We lost macOS dictation in v30 when migrating to NSTextInputClient.
diff --git a/src/nsterm.m b/src/nsterm.m
index 94a4602..51813b5 100644
index 8c26e27..70c7521 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1258,7 +1258,7 @@ If a completion candidate is selected (overlay or child frame),
@@ -157,7 +157,7 @@ index 94a4602..51813b5 100644
static BOOL
ns_ax_find_completion_overlay_range (struct buffer *b, ptrdiff_t point,
ptrdiff_t *out_start,
@@ -8743,7 +8793,6 @@ - (NSRect)accessibilityFrame
@@ -8738,7 +8788,6 @@ - (NSRect)accessibilityFrame
@end
@@ -165,7 +165,7 @@ index 94a4602..51813b5 100644
/* ===================================================================
EmacsAccessibilityBuffer (Notifications) — AX event dispatch
@@ -9288,7 +9337,6 @@ - (NSRect)accessibilityFrame
@@ -9283,7 +9332,6 @@ - (NSRect)accessibilityFrame
@end
@@ -173,7 +173,7 @@ index 94a4602..51813b5 100644
/* ===================================================================
EmacsAccessibilityInteractiveSpan — helpers and implementation
=================================================================== */
@@ -9618,6 +9666,7 @@ - (void)dealloc
@@ -9613,6 +9661,7 @@ - (void)dealloc
[layer release];
#endif
@@ -181,7 +181,7 @@ index 94a4602..51813b5 100644
[[self menu] release];
[super dealloc];
}
@@ -10966,6 +11015,32 @@ - (void)windowDidBecomeKey /* for direct calls */
@@ -10961,6 +11010,32 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop
@@ -214,7 +214,7 @@ index 94a4602..51813b5 100644
}
@@ -12203,6 +12278,332 @@ - (int) fullscreenState
@@ -12198,6 +12273,332 @@ - (int) fullscreenState
return fs_state;
}
@@ -547,7 +547,7 @@ index 94a4602..51813b5 100644
@end /* EmacsView */
@@ -14203,12 +14604,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
@@ -14198,12 +14599,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
ns_use_srgb_colorspace = YES;
DEFVAR_BOOL ("ns-accessibility-enabled", ns_accessibility_enabled,

2
patches/0006-doc-add-VoiceOver-accessibility-section-to-macOS-app.patch
View File

@@ -1,4 +1,4 @@
From 0accd96937592f4e9bc95356287367f0c56e0f5b Mon Sep 17 00:00:00 2001
From b40de953e11fce0df19bfe7c77b2b009246228ac Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 6/8] doc: add VoiceOver accessibility section to macOS

74
patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch
View File

@@ -1,4 +1,4 @@
From a8172542efe800cf6d29759007c9f826630da881 Mon Sep 17 00:00:00 2001
From 6c7d852b4667ec72a190d9a3008a46bbf3a78729 Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 14:46:25 +0100
Subject: [PATCH 7/8] ns: announce overlay completion candidates for VoiceOver
@@ -45,8 +45,8 @@ Key implementation details:
Independent overlay branch, BUF_CHARS_MODIFF gating, candidate
---
src/nsterm.h | 1 +
src/nsterm.m | 352 ++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 306 insertions(+), 47 deletions(-)
src/nsterm.m | 330 ++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 289 insertions(+), 42 deletions(-)
diff --git a/src/nsterm.h b/src/nsterm.h
index 6e830de..2102fb9 100644
@@ -61,7 +61,7 @@ index 6e830de..2102fb9 100644
@property (nonatomic, assign) BOOL cachedMarkActive;
@property (nonatomic, copy) NSString *cachedCompletionAnnouncement;
diff --git a/src/nsterm.m b/src/nsterm.m
index 51813b5..7ce683d 100644
index 70c7521..a3104d0 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7254,11 +7254,154 @@ Accessibility virtual elements (macOS / Cocoa only)
@@ -307,43 +307,7 @@ index 51813b5..7ce683d 100644
NSUInteger lo = 0, hi = visibleRunCount;
while (lo < hi)
{
@@ -8109,10 +8244,6 @@ - (NSUInteger)accessibilityIndexForCharpos:(ptrdiff_t)charpos
lo = mid + 1;
else
{
-<<<<<<< Updated upstream
- /* Found: charpos is inside this run. Compute UTF-16 delta
- directly from cachedText — no Lisp calls needed. */
-=======
/* Found: charpos is inside this run. Compute UTF-16 delta.
Fast path for pure-ASCII runs (ax_length == length): every
Emacs charpos maps to exactly one UTF-16 code unit, so the
@@ -8122,7 +8253,23 @@ conversion is O(1). This matters because ensureTextCache
cost per frame even when the buffer is unchanged.
Multi-byte runs fall through to the sequence walk, bounded
by run length (visible window), not total buffer size. */
->>>>>>> Stashed changes
+ NSUInteger chars_in = (NSUInteger)(charpos - r->charpos);
+ if (chars_in == 0)
+ return r->ax_start;
+ if (r->ax_length == (NSUInteger) r->length)
+ return r->ax_start + chars_in;
+ if (!cachedText)
+ return r->ax_start;
+ NSUInteger run_end_ax = r->ax_start + r->ax_length;
+ NSUInteger scan = r->ax_start;
+ for (NSUInteger c = 0; c < chars_in && scan < run_end_ax; c++)
+ {
+ NSRange seq = [cachedText
+ rangeOfComposedCharacterSequenceAtIndex:scan];
+ scan = NSMaxRange (seq);
+ }=======
+ directly from cachedText --- no Lisp calls needed. */
+>>>>>>> 8dd1a4c (ns: announce overlay completion candidates for VoiceOver)
NSUInteger chars_in = (NSUInteger)(charpos - r->charpos);
if (chars_in == 0)
return r->ax_start;
@@ -8151,10 +8298,10 @@ by run length (visible window), not total buffer size. */
@@ -8146,10 +8281,10 @@ by run length (visible window), not total buffer size. */
/* Convert accessibility string index to buffer charpos.
Safe to call from any thread: uses only cachedText (NSString) and
@@ -356,7 +320,7 @@ index 51813b5..7ce683d 100644
@synchronized (self)
{
if (visibleRunCount == 0)
@@ -8196,7 +8343,7 @@ the slow path (composed character sequence walk), which is
@@ -8191,7 +8326,7 @@ the slow path (composed character sequence walk), which is
return cp;
}
}
@@ -365,7 +329,7 @@ index 51813b5..7ce683d 100644
if (lo > 0)
{
ns_ax_visible_run *last = &visibleRuns[visibleRunCount - 1];
@@ -8218,7 +8365,7 @@ the slow path (composed character sequence walk), which is
@@ -8213,7 +8348,7 @@ the slow path (composed character sequence walk), which is
deadlocking the AX server thread. This is prevented by:
1. validWindow checks WINDOW_LIVE_P and BUFFERP before every
@@ -374,7 +338,7 @@ index 51813b5..7ce683d 100644
2. All dispatch_sync blocks run on the main thread where no
concurrent Lisp code can modify state between checks.
3. block_input prevents timer events and process output from
@@ -8572,6 +8719,50 @@ - (NSInteger)accessibilityInsertionPointLineNumber
@@ -8567,6 +8702,50 @@ - (NSInteger)accessibilityInsertionPointLineNumber
return [self lineForAXIndex:point_idx];
}
@@ -425,7 +389,7 @@ index 51813b5..7ce683d 100644
- (NSRange)accessibilityRangeForLine:(NSInteger)line
{
if (![NSThread isMainThread])
@@ -8794,7 +8985,7 @@ - (NSRect)accessibilityFrame
@@ -8789,7 +8968,7 @@ - (NSRect)accessibilityFrame
/* ===================================================================
@@ -434,7 +398,7 @@ index 51813b5..7ce683d 100644
These methods notify VoiceOver of text and selection changes.
Called from the redisplay cycle (postAccessibilityUpdates).
@@ -8809,7 +9000,7 @@ - (void)postTextChangedNotification:(ptrdiff_t)point
@@ -8804,7 +8983,7 @@ - (void)postTextChangedNotification:(ptrdiff_t)point
if (point > self.cachedPoint
&& point - self.cachedPoint == 1)
{
@@ -443,7 +407,7 @@ index 51813b5..7ce683d 100644
[self invalidateTextCache];
[self ensureTextCache];
if (cachedText)
@@ -8828,7 +9019,7 @@ - (void)postTextChangedNotification:(ptrdiff_t)point
@@ -8823,7 +9002,7 @@ - (void)postTextChangedNotification:(ptrdiff_t)point
/* Update cachedPoint here so the selection-move branch does NOT
fire for point changes caused by edits. WebKit and Chromium
never send both ValueChanged and SelectedTextChanged for the
@@ -452,7 +416,7 @@ index 51813b5..7ce683d 100644
self.cachedPoint = point;
NSDictionary *change = @{
@@ -9161,16 +9352,83 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
@@ -9156,16 +9335,83 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
BOOL markActive = !NILP (BVAR (b, mark_active));
/* --- Text changed (edit) --- */
@@ -540,7 +504,7 @@ index 51813b5..7ce683d 100644
{
ptrdiff_t oldPoint = self.cachedPoint;
BOOL oldMarkActive = self.cachedMarkActive;
@@ -9338,7 +9596,7 @@ - (NSRect)accessibilityFrame
@@ -9333,7 +9579,7 @@ - (NSRect)accessibilityFrame
/* ===================================================================
@@ -549,7 +513,7 @@ index 51813b5..7ce683d 100644
=================================================================== */
/* Scan visible range of window W for interactive spans.
@@ -9546,7 +9804,7 @@ - (void) setAccessibilityFocused: (BOOL) focused
@@ -9541,7 +9787,7 @@ - (void) setAccessibilityFocused: (BOOL) focused
dispatch_async (dispatch_get_main_queue (), ^{
/* lwin is a Lisp_Object captured by value. This is GC-safe
because Lisp_Objects are tagged integers/pointers that
@@ -558,7 +522,7 @@ index 51813b5..7ce683d 100644
Emacs. The WINDOW_LIVE_P check below guards against the
window being deleted between capture and execution. */
if (!WINDOWP (lwin) || NILP (Fwindow_live_p (lwin)))
@@ -9572,7 +9830,7 @@ - (void) setAccessibilityFocused: (BOOL) focused
@@ -9567,7 +9813,7 @@ - (void) setAccessibilityFocused: (BOOL) focused
@end
@@ -567,7 +531,7 @@ index 51813b5..7ce683d 100644
Methods are kept here (same .m file) so they access the ivars
declared in the @interface ivar block. */
@implementation EmacsAccessibilityBuffer (InteractiveSpans)
@@ -12294,7 +12552,7 @@ - (int) fullscreenState
@@ -12289,7 +12535,7 @@ - (int) fullscreenState
if (WINDOW_LEAF_P (w))
{
@@ -576,7 +540,7 @@ index 51813b5..7ce683d 100644
EmacsAccessibilityBuffer *elem
= [existing objectForKey:[NSValue valueWithPointer:w]];
if (!elem)
@@ -12328,7 +12586,7 @@ - (int) fullscreenState
@@ -12323,7 +12569,7 @@ - (int) fullscreenState
}
else
{
@@ -585,7 +549,7 @@ index 51813b5..7ce683d 100644
Lisp_Object child = w->contents;
while (!NILP (child))
{
@@ -12440,7 +12698,7 @@ - (void)postAccessibilityUpdates
@@ -12435,7 +12681,7 @@ - (void)postAccessibilityUpdates
accessibilityUpdating = YES;
/* Detect window tree change (split, delete, new buffer). Compare
@@ -594,7 +558,7 @@ index 51813b5..7ce683d 100644
Lisp_Object curRoot = FRAME_ROOT_WINDOW (emacsframe);
if (!EQ (curRoot, lastRootWindow))
{
@@ -12449,12 +12707,12 @@ - (void)postAccessibilityUpdates
@@ -12444,12 +12690,12 @@ - (void)postAccessibilityUpdates
}
/* If tree is stale, rebuild FIRST so we don't iterate freed

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

@@ -1,4 +1,4 @@
From fed3a06865d403db5d25074e7473c4d7c360f917 Mon Sep 17 00:00:00 2001
From fb4d1411fcc4a18cefae80dbed856fda8fe8c85e Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 16:01:29 +0100
Subject: [PATCH 8/8] ns: announce child frame completion candidates for
@@ -109,7 +109,7 @@ index 2102fb9..dd98d56 100644
@end
diff --git a/src/nsterm.m b/src/nsterm.m
index 7ce683d..8a1316a 100644
index a3104d0..6e8a226 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7398,6 +7398,112 @@ visual line index for Zoom (skip whitespace-only lines
@@ -268,7 +268,7 @@ index 7ce683d..8a1316a 100644
cachedTextStart = start;
if (visibleRuns)
@@ -9171,6 +9286,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
@@ -9154,6 +9269,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
ptrdiff_t currentOverlayStart = 0;
ptrdiff_t currentOverlayEnd = 0;
@@ -276,7 +276,7 @@ index 7ce683d..8a1316a 100644
specpdl_ref count2 = SPECPDL_INDEX ();
record_unwind_current_buffer ();
if (b != current_buffer)
@@ -9329,6 +9445,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
@@ -9312,6 +9428,7 @@ - (void)postCompletionAnnouncementForBuffer:(struct buffer *)b
self.cachedCompletionOverlayEnd = 0;
self.cachedCompletionPoint = 0;
}
@@ -284,7 +284,7 @@ index 7ce683d..8a1316a 100644
}
/* ---- Notification dispatch (main entry point) ---- */
@@ -9925,6 +10042,10 @@ - (void)dealloc
@@ -9908,6 +10025,10 @@ - (void)dealloc
#endif
[accessibilityElements release];
@@ -295,7 +295,7 @@ index 7ce683d..8a1316a 100644
[[self menu] release];
[super dealloc];
}
@@ -11374,6 +11495,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
@@ -11357,6 +11478,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
windowClosing = NO;
processingCompose = NO;
@@ -305,7 +305,7 @@ index 7ce683d..8a1316a 100644
scrollbarsNeedingUpdate = 0;
fs_state = FULLSCREEN_NONE;
fs_before_fs = next_maximized = -1;
@@ -12682,6 +12806,80 @@ - (id)accessibilityFocusedUIElement
@@ -12665,6 +12789,80 @@ - (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. */
@@ -386,7 +386,7 @@ index 7ce683d..8a1316a 100644
- (void)postAccessibilityUpdates
{
NSTRACE ("[EmacsView postAccessibilityUpdates]");
@@ -12692,11 +12890,59 @@ - (void)postAccessibilityUpdates
@@ -12675,11 +12873,59 @@ - (void)postAccessibilityUpdates
/* Re-entrance guard: VoiceOver callbacks during notification posting
can trigger redisplay, which calls ns_update_end, which calls us