Make (few) trivial substitutions for renamed and

new macros in dispextern.h, frame.h and window.h.

1 files changed, 12 insertions, 10 deletions

diff --git a/src/indent.c b/src/indent.c
index 22039ebca6b..10831c2c941 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1159,18 +1159,18 @@ struct position val_compute_motion;
 
         window_width - 1
          - (has_vertical_scroll_bars
-            ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
-            : (window_width + window_left != frame_width))
+            ? WINDOW_CONFIG_SCROLL_BAR_COLS (window)
+            : (window_width + window_left != frame_cols))
 
         where
-          window_width is XFASTINT (w->width),
-          window_left is XFASTINT (w->left),
+          window_width is XFASTINT (w->total_cols),
+          window_left is XFASTINT (w->left_col),
           has_vertical_scroll_bars is
-            FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
-          and frame_width = FRAME_WIDTH (XFRAME (window->frame))
+            WINDOW_HAS_VERTICAL_SCROLL_BAR (window)
+          and frame_cols = FRAME_COLS (XFRAME (window->frame))
 
-   Or you can let window_internal_width do this all for you, and write:
-        window_internal_width (w) - 1
+   Or you can let window_box_text_cols do this all for you, and write:
+        window_box_text_cols (w) - 1
 
    The `-1' accounts for the continuation-line backslashes; the rest
    accounts for window borders if the window is split horizontally, and
@@ -1366,7 +1366,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
         {
           if (hscroll
               || (truncate_partial_width_windows
-                  && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
+                  && width + 1 < FRAME_COLS (XFRAME (WINDOW_FRAME (win))))
               || !NILP (current_buffer->truncate_lines))
             {
               /* Truncating: skip to newline, unless we are already past
@@ -1834,7 +1834,9 @@ vmotion (from, vtarget, w)
      register int from, vtarget;
      struct window *w;
 {
-  int width = window_internal_width (w) - 1;
+  /* We don't need to make room for continuation marks (we have fringes now),
+     so hould we really subtract 1 here if FRAME_WINDOW_P ?  ++KFS  */
+  int width = window_box_text_cols (w) - 1;
   int hscroll = XINT (w->hscroll);
   struct position pos;
   /* vpos is cumulative vertical position, changed as from is changed */