From 01106707341f8acee7fa58adf75240ebaeb022e5 Mon Sep 17 00:00:00 2001 From: Daneel Date: Fri, 27 Feb 2026 11:06:11 +0100 Subject: [PATCH] patches: fix broken function insertion (build error) --- ...oundsForRange-for-macOS-Zoom-cursor-.patch | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch b/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch index c37b302..e161666 100644 --- a/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch +++ b/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch @@ -1,13 +1,13 @@ -From 507eb75584d56337a9f7edd8259c62aa40f3945a Mon Sep 17 00:00:00 2001 +From 3dedb68c7f8656ecdbae18533d092a4a91f3ddb7 Mon Sep 17 00:00:00 2001 From: Martin Sukany -Date: Fri, 27 Feb 2026 11:01:18 +0100 +Date: Fri, 27 Feb 2026 11:06:06 +0100 Subject: [PATCH] ns: implement VoiceOver accessibility (AXBoundsForRange, line nav, completions, interactive spans) --- src/nsterm.h | 109 ++ - src/nsterm.m | 2683 +++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 2642 insertions(+), 150 deletions(-) + src/nsterm.m | 2681 +++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 2641 insertions(+), 149 deletions(-) diff --git a/src/nsterm.h b/src/nsterm.h index 7c1ee4c..6c95673 100644 @@ -144,7 +144,7 @@ index 7c1ee4c..6c95673 100644 diff --git a/src/nsterm.m b/src/nsterm.m -index 932d209..76b1ae8 100644 +index 932d209..bedbe01 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch) @@ -205,7 +205,7 @@ index 932d209..76b1ae8 100644 ns_focus (f, NULL, 0); NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; -@@ -6849,220 +6886,2243 @@ - (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg +@@ -6849,219 +6886,2242 @@ - (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg /* ========================================================================== @@ -778,8 +778,6 @@ index 932d209..76b1ae8 100644 -#endif - [currentCursor setOnMouseEntered: YES]; -#endif -+/* Return the Emacs buffer Lisp object for window W, or Qnil. */ -+static Lisp_Object +/* Extract announcement string from completion--string property value. + The property can be a plain Lisp string (simple completion) or + a list ("candidate" "annotation") for annotated completions. @@ -794,6 +792,8 @@ index 932d209..76b1ae8 100644 + return nil; } ++/* Return the Emacs buffer Lisp object for window W, or Qnil. */ ++static Lisp_Object +ns_ax_window_buffer_object (struct window *w) +{ + if (!w) @@ -830,7 +830,6 @@ index 932d209..76b1ae8 100644 { - Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe); - int code; -- unsigned fnKeysym = 0; + Lisp_Object result + = Fnext_single_property_change (make_fixnum (pos), prop, + buf_obj, make_fixnum (limit)); @@ -2595,10 +2594,9 @@ index 932d209..76b1ae8 100644 +{ + Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe); + int code; -+ unsigned fnKeysym = 0; + unsigned fnKeysym = 0; static NSMutableArray *nsEvArray; unsigned int flags = [theEvent modifierFlags]; - @@ -8237,6 +10297,28 @@ - (void)windowDidBecomeKey /* for direct calls */ XSETFRAME (event.frame_or_window, emacsframe); kbd_buffer_store_event (&event);