patches: fix childFrameLastBuffer ivar init order
The Qnil initialization was in patch 0000 (Zoom) but the ivar declaration is in patch 0008 (child frame tracking). Moved the init to patch 0008 so each patch compiles independently.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From a5f18d7d2b4fdabb3d1ed10d536117ea8d641dad Mon Sep 17 00:00:00 2001
|
||||
From c38bfe9c3328a9355fe786fea0e6bddcf2bdd54f Mon Sep 17 00:00:00 2001
|
||||
From: Martin Sukany <martin@sukany.cz>
|
||||
Date: Sat, 28 Feb 2026 16:01:29 +0100
|
||||
Subject: [PATCH 9/9] ns: announce child frame completion candidates for
|
||||
@@ -43,8 +43,8 @@ refocus parent buffer element when child frame closes.
|
||||
doc/emacs/macos.texi | 6 -
|
||||
etc/NEWS | 4 +-
|
||||
src/nsterm.h | 5 +
|
||||
src/nsterm.m | 263 +++++++++++++++++++++++++++++++++++++++++--
|
||||
4 files changed, 260 insertions(+), 18 deletions(-)
|
||||
src/nsterm.m | 266 +++++++++++++++++++++++++++++++++++++++++--
|
||||
4 files changed, 263 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
|
||||
index 4825cf9..97777e2 100644
|
||||
@@ -109,7 +109,7 @@ index 2102fb9..dd98d56 100644
|
||||
@end
|
||||
|
||||
diff --git a/src/nsterm.m b/src/nsterm.m
|
||||
index e333d45..27607c0 100644
|
||||
index f1aa0a4..27607c0 100644
|
||||
--- a/src/nsterm.m
|
||||
+++ b/src/nsterm.m
|
||||
@@ -7352,6 +7352,112 @@ visual line index for Zoom (skip whitespace-only lines
|
||||
@@ -295,7 +295,17 @@ index e333d45..27607c0 100644
|
||||
[[self menu] release];
|
||||
[super dealloc];
|
||||
}
|
||||
@@ -12603,6 +12724,80 @@ - (id)accessibilityFocusedUIElement
|
||||
@@ -11292,6 +11413,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
|
||||
|
||||
windowClosing = NO;
|
||||
processingCompose = NO;
|
||||
+#ifdef NS_IMPL_COCOA
|
||||
+ childFrameLastBuffer = Qnil;
|
||||
+#endif
|
||||
scrollbarsNeedingUpdate = 0;
|
||||
fs_state = FULLSCREEN_NONE;
|
||||
fs_before_fs = next_maximized = -1;
|
||||
@@ -12600,6 +12724,80 @@ - (id)accessibilityFocusedUIElement
|
||||
The existing elements carry cached state (modiff, point) from the
|
||||
previous redisplay cycle. Rebuilding first would create fresh
|
||||
elements with current values, making change detection impossible. */
|
||||
@@ -376,7 +386,7 @@ index e333d45..27607c0 100644
|
||||
- (void)postAccessibilityUpdates
|
||||
{
|
||||
NSTRACE ("[EmacsView postAccessibilityUpdates]");
|
||||
@@ -12613,11 +12808,59 @@ - (void)postAccessibilityUpdates
|
||||
@@ -12610,11 +12808,59 @@ - (void)postAccessibilityUpdates
|
||||
|
||||
/* Re-entrance guard: VoiceOver callbacks during notification posting
|
||||
can trigger redisplay, which calls ns_update_end, which calls us
|
||||
|
||||
Reference in New Issue
Block a user