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

v15.5: fix Fset_mark -> Fset_marker(BVAR(b,mark), pos, buf)

Browse Source
This commit is contained in:
Daneel
2026-02-26 15:22:02 +01:00
parent 31e452ed5c
commit 9cf5382bc7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch
View File

@@ -73,7 +73,7 @@ index 7c1ee4c..4abeafe 100644
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index 932d209..c8a615f 100644 index 932d209..95a360d 100644
--- a/src/nsterm.m --- a/src/nsterm.m
+++ b/src/nsterm.m +++ b/src/nsterm.m
@@ -1104,6 +1104,11 @@ ns_update_end (struct frame *f) @@ -1104,6 +1104,11 @@ ns_update_end (struct frame *f)
@@ -126,7 +126,7 @@ index 932d209..c8a615f 100644
ns_focus (f, NULL, 0); ns_focus (f, NULL, 0);
NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; NSGraphicsContext *ctx = [NSGraphicsContext currentContext];
@@ -6847,6 +6883,889 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action) @@ -6847,6 +6883,890 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
} }
#endif #endif
@@ -519,7 +519,8 @@ index 932d209..c8a615f 100644
+ + (ptrdiff_t) (range.location + range.length); + + (ptrdiff_t) (range.location + range.length);
+ if (mark_charpos > BUF_ZV (b)) + if (mark_charpos > BUF_ZV (b))
+ mark_charpos = BUF_ZV (b); + mark_charpos = BUF_ZV (b);
+ Fset_mark (make_fixnum (mark_charpos)); + Fset_marker (BVAR (b, mark), make_fixnum (mark_charpos),
+ Fcurrent_buffer ());
+ } + }
+ +
+ if (b != oldb) + if (b != oldb)
@@ -1016,7 +1017,7 @@ index 932d209..c8a615f 100644
/* ========================================================================== /* ==========================================================================
EmacsView implementation EmacsView implementation
@@ -6889,6 +7808,7 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action) @@ -6889,6 +7809,7 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
[layer release]; [layer release];
#endif #endif
@@ -1024,7 +1025,7 @@ index 932d209..c8a615f 100644
[[self menu] release]; [[self menu] release];
[super dealloc]; [super dealloc];
} }
@@ -8237,6 +9157,27 @@ ns_in_echo_area (void) @@ -8237,6 +9158,27 @@ ns_in_echo_area (void)
XSETFRAME (event.frame_or_window, emacsframe); XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event); kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop ns_send_appdefined (-1); // Kick main loop
@@ -1052,7 +1053,7 @@ index 932d209..c8a615f 100644
} }
@@ -9474,6 +10415,297 @@ ns_in_echo_area (void) @@ -9474,6 +10416,297 @@ ns_in_echo_area (void)
return fs_state; return fs_state;
} }
@@ -1350,7 +1351,7 @@ index 932d209..c8a615f 100644
@end /* EmacsView */ @end /* EmacsView */
@@ -9941,6 +11173,14 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c) @@ -9941,6 +11174,14 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
return [super accessibilityAttributeValue:attribute]; return [super accessibilityAttributeValue:attribute];
} }