aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Möllmann2024-11-16 13:51:50 +0100
committerGerd Möllmann2024-11-16 13:51:50 +0100
commite5a2bc740dc43de63acb6e9603ad1905fac1e2c6 (patch)
tree3710ea1733b746f420836fc892b7a1e52b28cb66 /src
parent627cbf05b53756883a789ff45727acf23f5066a4 (diff)
downloademacs-e5a2bc740dc43de63acb6e9603ad1905fac1e2c6.tar.gz
emacs-e5a2bc740dc43de63acb6e9603ad1905fac1e2c6.zip
Revert "Remove an unused parameter"
This reverts commit 627cbf05b53756883a789ff45727acf23f5066a4.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h2
-rw-r--r--src/dispnew.c4
-rw-r--r--src/xdisp.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 0bbd7beeb91..47afc48bb60 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3922,7 +3922,7 @@ Lisp_Object frames_in_reverse_z_order (struct frame *f, bool visible);
3922bool is_tty_frame (struct frame *f); 3922bool is_tty_frame (struct frame *f);
3923bool is_tty_child_frame (struct frame *f); 3923bool is_tty_child_frame (struct frame *f);
3924bool is_tty_root_frame (struct frame *f); 3924bool is_tty_root_frame (struct frame *f);
3925void combine_updates (Lisp_Object root_frames); 3925void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
3926void combine_updates_for_frame (struct frame *f, bool inhibit_id_p); 3926void combine_updates_for_frame (struct frame *f, bool inhibit_id_p);
3927void tty_raise_lower_frame (struct frame *f, bool raise); 3927void tty_raise_lower_frame (struct frame *f, bool raise);
3928int max_child_z_order (struct frame *parent); 3928int max_child_z_order (struct frame *parent);
diff --git a/src/dispnew.c b/src/dispnew.c
index cbc7d4d7aaf..37ec37b752e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3987,12 +3987,12 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
3987 redisplay_internal as the last step of redisplaying. */ 3987 redisplay_internal as the last step of redisplaying. */
3988 3988
3989void 3989void
3990combine_updates (Lisp_Object roots) 3990combine_updates (Lisp_Object roots, bool inhibit_scrolling)
3991{ 3991{
3992 for (; CONSP (roots); roots = XCDR (roots)) 3992 for (; CONSP (roots); roots = XCDR (roots))
3993 { 3993 {
3994 struct frame *root = XFRAME (XCAR (roots)); 3994 struct frame *root = XFRAME (XCAR (roots));
3995 combine_updates_for_frame (root, false); 3995 combine_updates_for_frame (root, inhibit_scrolling);
3996 } 3996 }
3997} 3997}
3998 3998
diff --git a/src/xdisp.c b/src/xdisp.c
index 66140fe6010..3364c6870cf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17588,7 +17588,7 @@ redisplay_internal (void)
17588 } 17588 }
17589 17589
17590 if (CONSP (tty_root_frames)) 17590 if (CONSP (tty_root_frames))
17591 combine_updates (tty_root_frames); 17591 combine_updates (tty_root_frames, false);
17592 17592
17593 eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window)); 17593 eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
17594 17594