(message2_nolog): Fix arg types.

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index 6358a067ed83930d0ea8d3c410b775850fb4579e..31edf1ed7e6ef39bd6cd9f7cfaf24fcb5afdc46d 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -779,6 +779,8 @@ EmacsFrameResize (widget)
   change_frame_size (f, rows, columns, 0, 1);
   update_wm_hints (ew); 
   update_various_frame_slots (ew);
+
+  cancel_mouse_face (f);
 }
 
 static Boolean
@@ -844,7 +846,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
   /* #### This doesn't work, I haven't been able to find ANY kludge that
      will let (x-create-frame '((iconic . t))) work.  It seems that changes
      to wm_shell's iconic slot have no effect after it has been realized,
-     and calling XIconifyWindow doesn't work either (even thought the window
+     and calling XIconifyWindow doesn't work either (even though the window
      has been created.)  Perhaps there is some property we could smash
      directly, but I'm sick of this for now.
    */
@@ -951,6 +953,8 @@ EmacsFrameSetCharSize (widget, columns, rows)
       update_hints_inhibit = 0;
       update_wm_hints (ew);
 
+      do_pending_window_change ();
+
       /* These seem to get clobbered.  I don't know why. - rms.  */
       f->output_data.x->widget->core.x = old_left;
       f->output_data.x->widget->core.y = old_top;
@@ -962,3 +966,13 @@ EmacsFrameSetCharSize (widget, columns, rows)
      we have to make sure to do it here.  */
   SET_FRAME_GARBAGED (f);
 }
+\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;
+}