Revert "Remove an unused parameter"

This reverts commit 627cbf05b53756883a789ff45727acf23f5066a4.

(cherry picked from commit e5a2bc740dc43de63acb6e9603ad1905fac1e2c6)

diff --git a/src/dispextern.h b/src/dispextern.h
index ea7b0399adc151afd44b82d40055fb70189c57bd..20674a7c8b21c808ac72a74fe52d53714e2290ff 100644 (file)
--- 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);
+void combine_updates (Lisp_Object root_frames, bool inhibit_id_p);
 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 21411f2e147193c881e75663e984da25dbd6d366..f23aea148e076e97c12740e5e4d2ef09cdfc0888 100644 (file)
--- 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)
+combine_updates (Lisp_Object roots, bool inhibit_scrolling)
 {
   for (; CONSP (roots); roots = XCDR (roots))
     {
       struct frame *root = XFRAME (XCAR (roots));
-      combine_updates_for_frame (root, false);
+      combine_updates_for_frame (root, inhibit_scrolling);
     }
 }
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 5f85030ec602ba12716ffecd44c150d8670ff6ef..6a784431d46adf4ba23a47e6967d230e021101a2 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17590,7 +17590,7 @@ redisplay_internal (void)
        }
 
       if (CONSP (tty_root_frames))
-       combine_updates (tty_root_frames);
+       combine_updates (tty_root_frames, false);
 
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));