Fringe cleanup.

Use renamed symbols.

diff --git a/mac/src/macfns.c b/mac/src/macfns.c
index 9969ead95039f60101a2fa728090699f9ccb6d4c..ce281535e5d6955806bc9d62d1e305f31fa75df8 100644 (file)
--- a/mac/src/macfns.c
+++ b/mac/src/macfns.c
@@ -3386,8 +3386,8 @@ x_figure_window_size (f, parms)
        : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
        ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
        : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.mac->font)));
-  f->output_data.mac->flags_areas_extra
-    = FRAME_FLAGS_AREA_WIDTH (f);
+  f->output_data.mac->fringes_extra
+    = FRAME_FRINGE_WIDTH (f);
   f->output_data.mac->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
   f->output_data.mac->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
 

diff --git a/src/w32fns.c b/src/w32fns.c
index a86990cf78dd90890d04190800d238a5b9c8f65b..7a962bf88116c6d3520df4315142f1bfe184f506 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3239,8 +3239,8 @@ x_figure_window_size (f, parms)
        : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
        ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
        : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
-  f->output_data.w32->flags_areas_extra
-    = FRAME_FLAGS_AREA_WIDTH (f);
+  f->output_data.w32->fringes_extra
+    = FRAME_FRINGE_WIDTH (f);
   f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
   f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);
 

diff --git a/src/widget.c b/src/widget.c
index 53091847c8f284e1e72f3783fbc050fae038048f..15dd25f8221cdc191850310576cc6a753d151563 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -434,8 +434,8 @@ set_frame_size (ew)
         : (FRAME_SCROLL_BAR_COLS (frame)
            * FONT_WIDTH (frame->output_data.x->font)));
 
-    frame->output_data.x->flags_areas_extra
-      = FRAME_FLAGS_AREA_WIDTH (frame);
+    frame->output_data.x->fringes_extra
+      = FRAME_FRINGE_WIDTH (frame);
 
     change_frame_size (frame, h, w, 1, 0, 0);
     char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
@@ -912,8 +912,8 @@ EmacsFrameSetCharSize (widget, columns, rows)
        ? 0
        : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
 
-  f->output_data.x->flags_areas_extra
-    = FRAME_FLAGS_AREA_WIDTH (f);
+  f->output_data.x->fringes_extra
+    = FRAME_FRINGE_WIDTH (f);
 
   char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);
 

diff --git a/src/xfns.c b/src/xfns.c
index 7132aa858ce6eb9ba534902fafc96463901fa71c..fe3667c81687cc4c91f5becf0d0295fbfb88843b 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3120,8 +3120,8 @@ x_figure_window_size (f, parms)
     = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
        ? 0
        : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font)));
-  f->output_data.x->flags_areas_extra
-    = FRAME_FLAGS_AREA_WIDTH (f);
+  f->output_data.x->fringes_extra
+    = FRAME_FRINGE_WIDTH (f);
   f->output_data.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
   f->output_data.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);