patches: fix duplicate lastCursorRect ivar (build error)
Zoom (0000) declares lastCursorRect @public in EmacsView. VoiceOver (0005) was re-declaring it, causing 'duplicate member' compiler error when both applied together. Removed the duplicate.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From fc690cc07ee404cbc8a2733d4cdb6d9d19f30b2e Mon Sep 17 00:00:00 2001
|
||||
From f10036eeadf681cd87bbec7ec0581b572053c38a 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/9] ns: integrate accessibility with EmacsView and redisplay
|
||||
@@ -23,9 +23,8 @@ block cursor, org-mode folded headings, indirect buffers.
|
||||
Known limitations documented in patch 6 Texinfo node.
|
||||
---
|
||||
etc/NEWS | 13 ++
|
||||
src/nsterm.h | 2 +
|
||||
src/nsterm.m | 369 +++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||
3 files changed, 376 insertions(+), 8 deletions(-)
|
||||
2 files changed, 374 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/etc/NEWS b/etc/NEWS
|
||||
index f10d17e..f48d05b 100644
|
||||
@@ -51,19 +50,6 @@ index f10d17e..f48d05b 100644
|
||||
---
|
||||
** Re-introduced dictation, lost in Emacs v30 (macOS).
|
||||
We lost macOS dictation in v30 when migrating to NSTextInputClient.
|
||||
diff --git a/src/nsterm.h b/src/nsterm.h
|
||||
index 6e830de..dd4e3da 100644
|
||||
--- a/src/nsterm.h
|
||||
+++ b/src/nsterm.h
|
||||
@@ -593,6 +593,8 @@ typedef NS_ENUM (NSInteger, EmacsAXSpanType)
|
||||
Lisp_Object lastRootWindow;
|
||||
BOOL accessibilityTreeValid;
|
||||
BOOL accessibilityUpdating;
|
||||
+ @public /* Accessed by ns_draw_phys_cursor (C function). */
|
||||
+ NSRect lastCursorRect;
|
||||
#endif
|
||||
BOOL font_panel_active;
|
||||
NSFont *font_panel_result;
|
||||
diff --git a/src/nsterm.m b/src/nsterm.m
|
||||
index 907ce47..d813274 100644
|
||||
--- a/src/nsterm.m
|
||||
|
||||
Reference in New Issue
Block a user