(widget_store_internal_border): New function.

(EmacsFrameSetValues): Undo previous change.

1 files changed, 10 insertions, 11 deletions

diff --git a/src/widget.c b/src/widget.c
index b9dfe47a3a5..55be90fee91 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -796,7 +796,6 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
   Boolean has_to_recompute_size;
   Boolean has_to_recompute_gcs;
   Boolean has_to_update_hints;
-  Boolean has_to_update_internal_border_width;
 
   int char_width, char_height;
   Dimension pixel_width;
@@ -815,10 +814,6 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
 
   has_to_update_hints = (cur->emacs_frame.font != new->emacs_frame.font);
 
-  has_to_update_internal_border_width
-    = (cur->emacs_frame.internal_border_width
-       != new->emacs_frame.internal_border_width);
-
   if (has_to_recompute_gcs)
     {
       setup_frame_gcs (new);
@@ -844,12 +839,6 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
   if (has_to_update_hints)
     update_wm_hints (new);
 
-  /* Don't clobber the internal_border_width
-     if the caller did not try to change it.  */
-  if (! has_to_update_internal_border_width)
-    new->emacs_frame.internal_border_width
-      = new->emacs_frame.frame->output_data.x->internal_border_width;
-
   update_various_frame_slots (new);
 
   /* #### This doesn't work, I haven't been able to find ANY kludge that
@@ -975,3 +964,13 @@ EmacsFrameSetCharSize (widget, columns, rows)
      we have to make sure to do it here.  */
   SET_FRAME_GARBAGED (f);
 }
+
+widget_store_internal_border (widget)
+     Widget widget;
+{
+  EmacsFrame ew = (EmacsFrame) widget;
+  FRAME_PTR f = ew->emacs_frame.frame;
+
+  ew->emacs_frame.internal_border_width
+    = f->output_data.x->internal_border_width;
+}