patches: fix broken function insertion (build error)

This commit is contained in:
2026-02-27 11:06:11 +01:00
parent ab4367c459
commit 0110670734

View File

@@ -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 <martin@sukany.cz> From: Martin Sukany <martin@sukany.cz>
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 Subject: [PATCH] ns: implement VoiceOver accessibility (AXBoundsForRange, line
nav, completions, interactive spans) nav, completions, interactive spans)
--- ---
src/nsterm.h | 109 ++ src/nsterm.h | 109 ++
src/nsterm.m | 2683 +++++++++++++++++++++++++++++++++++++++++++++++--- src/nsterm.m | 2681 +++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 2642 insertions(+), 150 deletions(-) 2 files changed, 2641 insertions(+), 149 deletions(-)
diff --git a/src/nsterm.h b/src/nsterm.h diff --git a/src/nsterm.h b/src/nsterm.h
index 7c1ee4c..6c95673 100644 index 7c1ee4c..6c95673 100644
@@ -144,7 +144,7 @@ index 7c1ee4c..6c95673 100644
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index 932d209..76b1ae8 100644 index 932d209..bedbe01 100644
--- a/src/nsterm.m --- a/src/nsterm.m
+++ b/src/nsterm.m +++ b/src/nsterm.m
@@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch) @@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch)
@@ -205,7 +205,7 @@ index 932d209..76b1ae8 100644
ns_focus (f, NULL, 0); ns_focus (f, NULL, 0);
NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; 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 -#endif
- [currentCursor setOnMouseEntered: YES]; - [currentCursor setOnMouseEntered: YES];
-#endif -#endif
+/* Return the Emacs buffer Lisp object for window W, or Qnil. */
+static Lisp_Object
+/* Extract announcement string from completion--string property value. +/* Extract announcement string from completion--string property value.
+ The property can be a plain Lisp string (simple completion) or + The property can be a plain Lisp string (simple completion) or
+ a list ("candidate" "annotation") for annotated completions. + a list ("candidate" "annotation") for annotated completions.
@@ -794,6 +792,8 @@ index 932d209..76b1ae8 100644
+ return nil; + return nil;
} }
+/* Return the Emacs buffer Lisp object for window W, or Qnil. */
+static Lisp_Object
+ns_ax_window_buffer_object (struct window *w) +ns_ax_window_buffer_object (struct window *w)
+{ +{
+ if (!w) + if (!w)
@@ -830,7 +830,6 @@ index 932d209..76b1ae8 100644
{ {
- Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe); - Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe);
- int code; - int code;
- unsigned fnKeysym = 0;
+ Lisp_Object result + Lisp_Object result
+ = Fnext_single_property_change (make_fixnum (pos), prop, + = Fnext_single_property_change (make_fixnum (pos), prop,
+ buf_obj, make_fixnum (limit)); + buf_obj, make_fixnum (limit));
@@ -2595,10 +2594,9 @@ index 932d209..76b1ae8 100644
+{ +{
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe); + Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (emacsframe);
+ int code; + int code;
+ unsigned fnKeysym = 0; unsigned fnKeysym = 0;
static NSMutableArray *nsEvArray; static NSMutableArray *nsEvArray;
unsigned int flags = [theEvent modifierFlags]; unsigned int flags = [theEvent modifierFlags];
@@ -8237,6 +10297,28 @@ - (void)windowDidBecomeKey /* for direct calls */ @@ -8237,6 +10297,28 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe); XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event); kbd_buffer_store_event (&event);