comparison src/window.c @ 88050:449ffc76e463

* window.c (run_window_configuration_change_hook): New function. Code extracted from set_window_buffer. Set the selected frame. (set_window_buffer): Use it. * window.h (run_window_configuration_change_hook): Declare. * dispnew.c (change_frame_size_1): Use it instead of set-window-buffer.

88049:3f51de0dbaee

}

EXFUN (Fset_window_fringes, 4);
EXFUN (Fset_window_scroll_bars, 4);

/* Make WINDOW display BUFFER as its contents.  RUN_HOOKS_P non-zero
   means it's allowed to run hooks.  See make_frame for a case where
   it's not allowed.  KEEP_MARGINS_P non-zero means that the current
   margins, fringes, and scroll-bar settings of the window are not
   reset from the buffer's local settings.  */

  if (run_hooks_p)
    {
      if (! NILP (Vwindow_scroll_functions))
	run_hook_with_args_2 (Qwindow_scroll_functions, window,
			      Fmarker_position (w->start));

      if (! NILP (Vwindow_configuration_change_hook)
	  && ! NILP (Vrun_hooks))
	call1 (Vrun_hooks, Qwindow_configuration_change_hook);
    }

  unbind_to (count, Qnil);
}

88050:449ffc76e463

}

EXFUN (Fset_window_fringes, 4);
EXFUN (Fset_window_scroll_bars, 4);

void
run_window_configuration_change_hook (struct frame *f)
{
  if (! NILP (Vwindow_configuration_change_hook)
      && ! NILP (Vrun_hooks))
    {
      int count = SPECPDL_INDEX ();
      if (SELECTED_FRAME () != f)
	{
	  Lisp_Object frame;
	  XSETFRAME (frame, f);
	  record_unwind_protect (Fselect_frame, Fselected_frame ());
	  Fselect_frame (frame);
	}
      call1 (Vrun_hooks, Qwindow_configuration_change_hook);
      unbind_to (count, Qnil);
    }
}

/* Make WINDOW display BUFFER as its contents.  RUN_HOOKS_P non-zero
   means it's allowed to run hooks.  See make_frame for a case where
   it's not allowed.  KEEP_MARGINS_P non-zero means that the current
   margins, fringes, and scroll-bar settings of the window are not
   reset from the buffer's local settings.  */

  if (run_hooks_p)
    {
      if (! NILP (Vwindow_scroll_functions))
	run_hook_with_args_2 (Qwindow_scroll_functions, window,
			      Fmarker_position (w->start));
      run_window_configuration_change_hook (XFRAME (WINDOW_FRAME (w)));
    }

  unbind_to (count, Qnil);
}