From 61b5b5daf1fb01bd4db67efacc9ec943475decdf Mon Sep 17 00:00:00 2001 From: Daneel Date: Sat, 28 Feb 2026 22:45:05 +0100 Subject: [PATCH] patches: fix windowWillResize em-dash regression (iteration 3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch 0007 bulk em-dash→triple-dash replacement accidentally changed windowWillResize title format string and strstr search, introducing a user-visible regression. Reverted those two lines to em-dash. --- ...lay-completion-candidates-for-VoiceO.patch | 24 ++++--------------- ...d-frame-completion-candidates-for-Vo.patch | 4 ++-- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch b/patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch index 85f1bab..dc2d850 100644 --- a/patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch +++ b/patches/0007-ns-announce-overlay-completion-candidates-for-VoiceO.patch @@ -1,4 +1,4 @@ -From 5143187e2fa42fa8f5c28e4f39be08ca981692c9 Mon Sep 17 00:00:00 2001 +From 8561d7b8a00b9a7772c718f86fdde770e1c73d41 Mon Sep 17 00:00:00 2001 From: Martin Sukany Date: Sat, 28 Feb 2026 14:46:25 +0100 Subject: [PATCH 7/8] ns: announce overlay completion candidates for VoiceOver @@ -45,8 +45,8 @@ Key implementation details: Independent overlay branch, BUF_CHARS_MODIFF gating, candidate --- src/nsterm.h | 1 + - src/nsterm.m | 312 +++++++++++++++++++++++++++++++++++++++++++++------ - 2 files changed, 279 insertions(+), 34 deletions(-) + src/nsterm.m | 308 +++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 277 insertions(+), 32 deletions(-) diff --git a/src/nsterm.h b/src/nsterm.h index ec7b587..19a7e7a 100644 @@ -61,7 +61,7 @@ index ec7b587..19a7e7a 100644 @property (nonatomic, assign) BOOL cachedMarkActive; @property (nonatomic, copy) NSString *cachedCompletionAnnouncement; diff --git a/src/nsterm.m b/src/nsterm.m -index f0e8751..3d72b5d 100644 +index f0e8751..72478e0 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6884,11 +6884,154 @@ Accessibility virtual elements (macOS / Cocoa only) @@ -524,22 +524,6 @@ index f0e8751..3d72b5d 100644 Methods are kept here (same .m file) so they access the ivars declared in the @interface ivar block. */ @implementation EmacsAccessibilityBuffer (InteractiveSpans) -@@ -10490,13 +10734,13 @@ - (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize - if (old_title == 0) - { - char *t = strdup ([[[self window] title] UTF8String]); -- char *pos = strstr (t, " — "); -+ char *pos = strstr (t, " --- "); - if (pos) - *pos = '\0'; - old_title = t; - } - size_title = xmalloc (strlen (old_title) + 40); -- esprintf (size_title, "%s — (%d × %d)", old_title, cols, rows); -+ esprintf (size_title, "%s --- (%d × %d)", old_title, cols, rows); - [window setTitle: [NSString stringWithUTF8String: size_title]]; - [window display]; - xfree (size_title); @@ -11892,7 +12136,7 @@ - (int) fullscreenState if (WINDOW_LEAF_P (w)) diff --git a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch index 61abfa7..df54b3e 100644 --- a/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch +++ b/patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch @@ -1,4 +1,4 @@ -From f842c3813d3b9fd106d668fa872b1cb3b187e9cf Mon Sep 17 00:00:00 2001 +From 058cc9aad5c34796206749844df28acc9e09f0eb Mon Sep 17 00:00:00 2001 From: Martin Sukany Date: Sat, 28 Feb 2026 16:01:29 +0100 Subject: [PATCH 8/8] ns: announce child frame completion candidates for @@ -109,7 +109,7 @@ index 19a7e7a..49e8f00 100644 @end diff --git a/src/nsterm.m b/src/nsterm.m -index 3d72b5d..fefe2a7 100644 +index 72478e0..daa8f61 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7028,6 +7028,112 @@ visual line index for Zoom (skip whitespace-only lines