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

patches: fix leftover conflict markers in patch 0002

Browse Source
This commit is contained in:
Daneel
2026-03-01 09:17:45 +01:00
parent 0c13f5d6a3
commit e0343db56c
7 changed files with 47 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/0005-ns-integrate-accessibility-with-EmacsView-and-redisp.patch
View File

@@ -1,4 +1,4 @@
From 7aab25d3ba9b41d3d81693b04d8d74812cad9139 Mon Sep 17 00:00:00 2001
From 6f37c729a3646dc0ac4c68825edac8f6a81cd9ec Mon Sep 17 00:00:00 2001
From: Martin Sukany <martin@sukany.cz>
Date: Sat, 28 Feb 2026 12:58:11 +0100
Subject: [PATCH 5/8] ns: integrate accessibility with EmacsView and redisplay
@@ -51,7 +51,7 @@ index 80661a9..2b1f9e6 100644
** Re-introduced dictation, lost in Emacs v30 (macOS).
We lost macOS dictation in v30 when migrating to NSTextInputClient.
diff --git a/src/nsterm.m b/src/nsterm.m
index 94a4602..51813b5 100644
index 8c26e27..70c7521 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1258,7 +1258,7 @@ If a completion candidate is selected (overlay or child frame),
@@ -157,7 +157,7 @@ index 94a4602..51813b5 100644
static BOOL
ns_ax_find_completion_overlay_range (struct buffer *b, ptrdiff_t point,
ptrdiff_t *out_start,
@@ -8743,7 +8793,6 @@ - (NSRect)accessibilityFrame
@@ -8738,7 +8788,6 @@ - (NSRect)accessibilityFrame
@end
@@ -165,7 +165,7 @@ index 94a4602..51813b5 100644
/* ===================================================================
EmacsAccessibilityBuffer (Notifications) — AX event dispatch
@@ -9288,7 +9337,6 @@ - (NSRect)accessibilityFrame
@@ -9283,7 +9332,6 @@ - (NSRect)accessibilityFrame
@end
@@ -173,7 +173,7 @@ index 94a4602..51813b5 100644
/* ===================================================================
EmacsAccessibilityInteractiveSpan — helpers and implementation
=================================================================== */
@@ -9618,6 +9666,7 @@ - (void)dealloc
@@ -9613,6 +9661,7 @@ - (void)dealloc
[layer release];
#endif
@@ -181,7 +181,7 @@ index 94a4602..51813b5 100644
[[self menu] release];
[super dealloc];
}
@@ -10966,6 +11015,32 @@ - (void)windowDidBecomeKey /* for direct calls */
@@ -10961,6 +11010,32 @@ - (void)windowDidBecomeKey /* for direct calls */
XSETFRAME (event.frame_or_window, emacsframe);
kbd_buffer_store_event (&event);
ns_send_appdefined (-1); // Kick main loop
@@ -214,7 +214,7 @@ index 94a4602..51813b5 100644
}
@@ -12203,6 +12278,332 @@ - (int) fullscreenState
@@ -12198,6 +12273,332 @@ - (int) fullscreenState
return fs_state;
}
@@ -547,7 +547,7 @@ index 94a4602..51813b5 100644
@end /* EmacsView */
@@ -14203,12 +14604,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
@@ -14198,12 +14599,17 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
ns_use_srgb_colorspace = YES;
DEFVAR_BOOL ("ns-accessibility-enabled", ns_accessibility_enabled,