1 files changed, 5 insertions, 4 deletions

diff --git a/src/scroll.c b/src/scroll.c
index a786d3c2cf4..f4faca2fad8 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include "systty.h" /* For emacs_tty in termchar.h */
 #include "termchar.h"
 #include "lisp.h"
 #include "dispextern.h"
@@ -101,7 +102,7 @@ calculate_scrolling (frame, matrix, window_size, lines_below,
   register int cost, cost1;
 
   int lines_moved = window_size
-    + (TERMINAL_SCROLL_REGION_OK (CURRENT_TERMINAL ()) ? 0 : lines_below);
+    + (TTY_SCROLL_REGION_OK (FRAME_TTY (frame)) ? 0 : lines_below);
   /* first_insert_cost[I] is the cost of doing the first insert-line
      at the i'th line of the lines we are considering,
      where I is origin 1 (as it is below).  */
@@ -468,7 +469,7 @@ calculate_direct_scrolling (frame, matrix, window_size, lines_below,
      cost of scrolling by a distance of one.  The extra cost is
      added once for consistency with the cost vectors */
   scroll_overhead
-    = TERMINAL_SCROLL_REGION_COST (CURRENT_TERMINAL ()) + extra_cost;
+    = TTY_SCROLL_REGION_COST (FRAME_TTY (frame)) + extra_cost;
 
   /* initialize the top left corner of the matrix */
   matrix->writecost = 0;
@@ -820,7 +821,7 @@ scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom,
   matrix = ((struct matrix_elt *)
             alloca ((window_size + 1) * (window_size + 1) * sizeof *matrix));
 
-  if (TERMINAL_SCROLL_REGION_OK (CURRENT_TERMINAL ()))
+  if (TTY_SCROLL_REGION_OK (FRAME_TTY (frame)))
     {
       calculate_direct_scrolling (frame, matrix, window_size,
                                   unchanged_at_bottom,
@@ -916,7 +917,7 @@ scroll_cost (frame, from, to, amount)
   if (amount == 0)
     return 0;
 
-  if (! TERMINAL_SCROLL_REGION_OK (CURRENT_TERMINAL ()))
+  if (! TTY_SCROLL_REGION_OK (FRAME_TTY (frame)))
     limit = height;
   else if (amount > 0)
     limit += amount;