From 82bc6f1530882440324b00ee41cfadef5bf5c0e6 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 9 Jan 2025 09:37:13 +0100 Subject: [PATCH] In xt_action_hook don't act on deleted window's scroll bar (Bug#75120) * src/xterm.c (xt_action_hook): Make sure window_being_scrolled is live (Bug#75120). * src/pdumper.c (dump_subr): Update pertinent hash of HASH_Lisp_Subr. (cherry picked from commit 0edafe0fb6bb3df4fed09eb345b690fbce2c01bb) --- src/pdumper.c | 2 +- src/xterm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pdumper.c b/src/pdumper.c index cec950b7bc9..7d6eabb4b15 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -2966,7 +2966,7 @@ dump_bool_vector (struct dump_context *ctx, const struct Lisp_Vector *v) static dump_off dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr) { -#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_20B7443AD7) +#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_EE5F7351CC) # error "Lisp_Subr changed. See CHECK_STRUCTS comment in config.h." #endif struct Lisp_Subr out; diff --git a/src/xterm.c b/src/xterm.c index 01e3a931ae9..0692abbbb0b 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -15465,7 +15465,7 @@ xt_action_hook (Widget widget, XtPointer client_data, String action_name, if (scroll_bar_p && strcmp (action_name, end_action) == 0 - && WINDOWP (window_being_scrolled)) + && WINDOW_LIVE_P (window_being_scrolled)) { struct window *w; struct scroll_bar *bar; -- 2.39.5