patches: fix two more compile errors

- Remove f->child_frame_list (field does not exist in struct frame)
- Fix dangling else-if after goto label (skip_overlay_scan)
This commit is contained in:
2026-03-01 04:33:35 +01:00
parent 3d2fa7a54e
commit bc71e58123
9 changed files with 76 additions and 74 deletions

View File

@@ -1,4 +1,4 @@
From ef42812ff2e18ac2492a679a47da350ace8fab54 Mon Sep 17 00:00:00 2001
From 8d882bfbad959b55915da0a43897acf2aca3b2ed 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
@@ -51,10 +51,10 @@ 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 7fc542b..c35db76 100644
index 217f4f8..9de92fb 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1352,6 +1352,9 @@ so the visual offset is (ov_line + 1) * line_h from
@@ -1350,6 +1350,9 @@ so the visual offset is (ov_line + 1) * line_h from
if (view)
ns_zoom_track_completion (f, view);
#endif /* NS_IMPL_COCOA */
@@ -64,7 +64,7 @@ index 7fc542b..c35db76 100644
}
static void
@@ -7567,7 +7570,6 @@ - (id)accessibilityTopLevelUIElement
@@ -7565,7 +7568,6 @@ - (id)accessibilityTopLevelUIElement
@@ -72,7 +72,7 @@ index 7fc542b..c35db76 100644
static BOOL
ns_ax_find_completion_overlay_range (struct buffer *b, ptrdiff_t point,
ptrdiff_t *out_start,
@@ -8662,7 +8664,6 @@ - (NSRect)accessibilityFrame
@@ -8660,7 +8662,6 @@ - (NSRect)accessibilityFrame
@end
@@ -80,7 +80,7 @@ index 7fc542b..c35db76 100644
/* ===================================================================
EmacsAccessibilityBuffer (Notifications) — AX event dispatch
@@ -9207,7 +9208,6 @@ - (NSRect)accessibilityFrame
@@ -9205,7 +9206,6 @@ - (NSRect)accessibilityFrame
@end
@@ -88,7 +88,7 @@ index 7fc542b..c35db76 100644
/* ===================================================================
EmacsAccessibilityInteractiveSpan — helpers and implementation
=================================================================== */
@@ -9537,6 +9537,7 @@ - (void)dealloc
@@ -9535,6 +9535,7 @@ - (void)dealloc
[layer release];
#endif
@@ -96,7 +96,7 @@ index 7fc542b..c35db76 100644
[[self menu] release];
[super dealloc];
}
@@ -10885,6 +10886,32 @@ - (void)windowDidBecomeKey /* for direct calls */
@@ -10883,6 +10884,32 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop
@@ -129,7 +129,7 @@ index 7fc542b..c35db76 100644
}
@@ -12125,6 +12152,332 @@ - (int) fullscreenState
@@ -12123,6 +12150,332 @@ - (int) fullscreenState
return fs_state;
}