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

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
Martin Sukany
2026-02-26 13:27:31 +01:00
parent 05fc543958 64c40f4867
commit 6d185c880a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ index 7c1ee4c..8bf21f6 100644
diff --git a/src/nsterm.m b/src/nsterm.m diff --git a/src/nsterm.m b/src/nsterm.m
index 932d209..d2d80f7 100644 index 932d209..6543e3b 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)
@@ -124,7 +124,7 @@ index 932d209..d2d80f7 100644
ns_focus (f, NULL, 0); ns_focus (f, NULL, 0);
NSGraphicsContext *ctx = [NSGraphicsContext currentContext]; NSGraphicsContext *ctx = [NSGraphicsContext currentContext];
@@ -6847,6 +6883,719 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action) @@ -6847,6 +6883,717 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
} }
#endif #endif
@@ -536,7 +536,6 @@ index 932d209..d2d80f7 100644
+ +
+ NSUInteger len = [cachedText length]; + NSUInteger len = [cachedText length];
+ NSInteger cur_line = 0; + NSInteger cur_line = 0;
+ NSUInteger line_start = 0;
+ +
+ for (NSUInteger i = 0; i <= len; i++) + for (NSUInteger i = 0; i <= len; i++)
+ { + {
@@ -552,7 +551,6 @@ index 932d209..d2d80f7 100644
+ if (i < len && [cachedText characterAtIndex:i] == '\n') + if (i < len && [cachedText characterAtIndex:i] == '\n')
+ { + {
+ cur_line++; + cur_line++;
+ line_start = i + 1;
+ } + }
+ } + }
+ return NSMakeRange (NSNotFound, 0); + return NSMakeRange (NSNotFound, 0);
@@ -665,7 +663,7 @@ index 932d209..d2d80f7 100644
+ return NSMakeRange (0, 0); + return NSMakeRange (0, 0);
+ +
+ /* Compute visible range from window start to last visible row. */ + /* Compute visible range from window start to last visible row. */
+ ptrdiff_t vis_start = w->start_charpos; + ptrdiff_t vis_start = marker_position (w->start);
+ ptrdiff_t vis_end = vis_start; + ptrdiff_t vis_end = vis_start;
+ +
+ struct glyph_matrix *matrix = w->current_matrix; + struct glyph_matrix *matrix = w->current_matrix;
@@ -844,7 +842,7 @@ index 932d209..d2d80f7 100644
/* ========================================================================== /* ==========================================================================
EmacsView implementation EmacsView implementation
@@ -6889,6 +7638,7 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action) @@ -6889,6 +7636,7 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
[layer release]; [layer release];
#endif #endif
@@ -852,7 +850,7 @@ index 932d209..d2d80f7 100644
[[self menu] release]; [[self menu] release];
[super dealloc]; [super dealloc];
} }
@@ -8237,6 +8987,18 @@ ns_in_echo_area (void) @@ -8237,6 +8985,18 @@ 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
@@ -871,7 +869,7 @@ index 932d209..d2d80f7 100644
} }
@@ -9474,6 +10236,259 @@ ns_in_echo_area (void) @@ -9474,6 +10234,259 @@ ns_in_echo_area (void)
return fs_state; return fs_state;
} }
@@ -1131,7 +1129,7 @@ index 932d209..d2d80f7 100644
@end /* EmacsView */ @end /* EmacsView */
@@ -9941,6 +10956,14 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c) @@ -9941,6 +10954,14 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
return [super accessibilityAttributeValue:attribute]; return [super accessibilityAttributeValue:attribute];
} }