From 1ad6b8da6c1a06ff55ee61e0deafa93deadfa192 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Tue, 31 Mar 2026 11:20:25 +0200 Subject: [PATCH] Some fixes for the GNUstep build * src/nsterm.m ([EmacsView updateFramePosition]): Dereference emacsframe. ([EmacsView copyRect:to:]): Dereference emacsframe. --- src/nsterm.m | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/nsterm.m b/src/nsterm.m index 361a61af07f..beb5d8be0cd 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -8067,7 +8067,11 @@ ns_in_echo_area (void) struct input_event ie; EVENT_INIT (ie); ie.kind = MOVE_FRAME_EVENT; - XSETFRAME (ie.frame_or_window, emacsframe); +#ifdef HAVE_MPS + XSETFRAME (ie.frame_or_window, *emacsframe); +#else + XSETFRAME (ie.frame_or_window, emacsframe); +#endif XSETINT (ie.x, f->left_pos); XSETINT (ie.y, f->top_pos); kbd_buffer_store_event (&ie); @@ -9149,12 +9153,20 @@ ns_in_echo_area (void) #else hide_bell(); // Ensure the bell image isn't scrolled. - ns_focus (emacsframe, &dstRect, 1); +#ifdef HAVE_MPS + ns_focus (*emacsframe, &dstRect, 1); +#else + ns_focus (*emacsframe, &dstRect, 1); +#endif [self scrollRect: srcRect by: NSMakeSize (dstRect.origin.x - srcRect.origin.x, dstRect.origin.y - srcRect.origin.y)]; +#ifdef HAVE_MPS + ns_unfocus (*emacsframe); +#else ns_unfocus (emacsframe); #endif +#endif }