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

patches: fix duplicate EmacsAccessibilityBuffer(InteractiveSpans)

Browse Source 
Stub @implementation added in 0001 was never removed when 0004
added the full implementation, causing Clang to error:
  reimplementation of category 'InteractiveSpans'

Remove the stub block in 0004 (interactive span elements for Tab).
This commit is contained in:
Daneel
2026-03-04 19:42:01 +01:00
parent ad868e0fab
commit abc518a60a
5 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/0005-ns-wire-accessibility-into-EmacsView-and-redisplay.patch
View File

@@ -1,4 +1,4 @@
From 6a4b906f183f4472b3df458cdfbeb7d9dfef95f4 Mon Sep 17 00:00:00 2001
From cba3eda4d3c50dcd77c73353c6a8d2713bfcb8ae Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Wed, 4 Mar 2026 15:23:55 +0100
Subject: [PATCH 6/9] ns: wire accessibility into EmacsView and redisplay
@@ -51,7 +51,7 @@ index 4c149e41d6..7f917f93b2 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 c713943b30..b66f350486 100644
index b327102521..e003bca5bd 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1405,7 +1405,8 @@ so the visual offset is (ov_line + 1) * line_h from
@@ -132,7 +132,7 @@ index c713943b30..b66f350486 100644
- (void)antialiasThresholdDidChange:(NSNotification *)notification
{
#ifdef NS_IMPL_COCOA
@@ -8780,7 +8832,6 @@ - (NSRect)accessibilityFrame
@@ -8769,7 +8821,6 @@ - (NSRect)accessibilityFrame
@end
@@ -140,7 +140,7 @@ index c713943b30..b66f350486 100644
/* ===================================================================
EmacsAccessibilityBuffer (Notifications) — AX event dispatch
@@ -9274,6 +9325,54 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
@@ -9263,6 +9314,54 @@ - (void)postAccessibilityNotificationsForFrame:(struct frame *)f
granularity = ns_ax_text_selection_granularity_line;
}
@@ -195,7 +195,7 @@ index c713943b30..b66f350486 100644
/* Post notifications for focused and non-focused elements. */
if ([self isAccessibilityFocused])
[self postFocusedCursorNotification:point
@@ -9386,7 +9485,6 @@ - (NSRect)accessibilityFrame
@@ -9375,7 +9474,6 @@ - (NSRect)accessibilityFrame
@end
@@ -203,7 +203,7 @@ index c713943b30..b66f350486 100644
/* ===================================================================
EmacsAccessibilityInteractiveSpan --- helpers and implementation
=================================================================== */
@@ -9723,6 +9821,7 @@ - (void)dealloc
@@ -9712,6 +9810,7 @@ - (void)dealloc
[layer release];
#endif
@@ -211,7 +211,7 @@ index c713943b30..b66f350486 100644
[[self menu] release];
[super dealloc];
}
@@ -11071,6 +11170,32 @@ - (void)windowDidBecomeKey /* for direct calls */
@@ -11060,6 +11159,32 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop
@@ -244,7 +244,7 @@ index c713943b30..b66f350486 100644
}
@@ -12308,6 +12433,332 @@ - (int) fullscreenState
@@ -12297,6 +12422,332 @@ - (int) fullscreenState
return fs_state;
}
@@ -577,7 +577,7 @@ index c713943b30..b66f350486 100644
@end /* EmacsView */
@@ -14304,13 +14755,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
@@ -14293,13 +14744,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,