martin/emacs-doom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patches: 0008 fix specpdl_ref type (not ptrdiff_t)

Browse Source
This commit is contained in:
Daneel
2026-02-28 16:19:08 +01:00
parent 5aa0f05a33
commit 3e5fe814b8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/0008-ns-announce-child-frame-completion-candidates-for-Vo.patch
View File

@@ -1,4 +1,4 @@
From e685c5e8e9c7355ee8c36fa2d567bbdb3b4af5fe Mon Sep 17 00:00:00 2001 From e11d0688f119046827cd1895008d3a93e22f6d0d Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz> From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 16:01:29 +0100 Date: Sat, 28 Feb 2026 16:01:29 +0100
Subject: [PATCH 2/2] ns: announce child frame completion candidates for Subject: [PATCH 2/2] ns: announce child frame completion candidates for
@@ -37,9 +37,6 @@ for minibuffer overlay completion) because the child frame renders
independently --- its ns_update_end runs after the parent frame's independently --- its ns_update_end runs after the parent frame's
draw_window_cursor, so the last Zoom call wins. draw_window_cursor, so the last Zoom call wins.
Deduplication uses a C string cache (xstrdup/xfree) to avoid ObjC
memory management complexity in static storage.
* src/nsterm.h (EmacsView): Add announceChildFrameCompletion. * src/nsterm.h (EmacsView): Add announceChildFrameCompletion.
* src/nsterm.m (ns_ax_selected_child_frame_text): New function. * src/nsterm.m (ns_ax_selected_child_frame_text): New function.
(EmacsView announceChildFrameCompletion): New method. (EmacsView announceChildFrameCompletion): New method.
@@ -63,7 +60,7 @@ index 5c15639..21b2823 100644
@end @end
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index d13c5c7..9432c9b 100644 index d13c5c7..092bc11 100644
--- a/src/nsterm.m --- a/src/nsterm.m
+++ b/src/nsterm.m +++ b/src/nsterm.m
@@ -7066,6 +7066,110 @@ ns_ax_selected_overlay_text (struct buffer *b, @@ -7066,6 +7066,110 @@ ns_ax_selected_overlay_text (struct buffer *b,
@@ -92,7 +89,7 @@ index d13c5c7..9432c9b 100644
+ /* Temporarily switch to the child frame buffer. + /* Temporarily switch to the child frame buffer.
+ Fbuffer_substring_no_properties operates on current_buffer, + Fbuffer_substring_no_properties operates on current_buffer,
+ which may be a different buffer (e.g., the parent frame's). */ + which may be a different buffer (e.g., the parent frame's). */
+ ptrdiff_t count = SPECPDL_INDEX (); + specpdl_ref count = SPECPDL_INDEX ();
+ record_unwind_current_buffer (); + record_unwind_current_buffer ();
+ set_buffer_internal_1 (b); + set_buffer_internal_1 (b);
+ +