From d5c427a58863cad965c2472b5c71feb2301ba875 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Sat, 16 Nov 2024 08:57:35 +0100 Subject: [PATCH] Remove an unused parameter of combine_updates * src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling. * src/xdisp.c (redisplay_internal): Adjust caller. * src/dispextern.h: Change function prototype. (cherry picked from commit 76c64dcc8025e42d1a85a053d8da58d5462a95ab) --- src/dispextern.h | 2 +- src/dispnew.c | 4 ++-- src/xdisp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dispextern.h b/src/dispextern.h index 20674a7c8b2..ea7b0399adc 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3951,7 +3951,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible); bool is_tty_frame (struct frame *f); bool is_tty_child_frame (struct frame *f); bool is_tty_root_frame (struct frame *f); -void combine_updates (Lisp_Object root_frames, bool inhibit_id_p); +void combine_updates (Lisp_Object root_frames); void combine_updates_for_frame (struct frame *f, bool inhibit_id_p); void tty_raise_lower_frame (struct frame *f, bool raise); int max_child_z_order (struct frame *parent); diff --git a/src/dispnew.c b/src/dispnew.c index f23aea148e0..21411f2e147 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3984,12 +3984,12 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling) redisplay_internal as the last step of redisplaying. */ void -combine_updates (Lisp_Object roots, bool inhibit_scrolling) +combine_updates (Lisp_Object roots) { for (; CONSP (roots); roots = XCDR (roots)) { struct frame *root = XFRAME (XCAR (roots)); - combine_updates_for_frame (root, inhibit_scrolling); + combine_updates_for_frame (root, false); } } diff --git a/src/xdisp.c b/src/xdisp.c index f8f110b8bb1..013fd543ff2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -17592,7 +17592,7 @@ redisplay_internal (void) } if (CONSP (tty_root_frames)) - combine_updates (tty_root_frames, false); + combine_updates (tty_root_frames); eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window)); -- 2.39.5