comparison src/window.c @ 52617:f8adaf14f570

(set_window_buffer): Fix redisplay problems when switching between buffers with different display margin widths.

52616:3c1bf15e7a4d

    {
      /* Set left and right marginal area width etc. from buffer.  */

      /* This may call adjust_window_margins three times, so
	 temporarily disable window margins.  */
      w->left_margin_cols = w->right_margin_cols = Qnil;

      Fset_window_fringes (window,
			   b->left_fringe_width, b->right_fringe_width,
			   b->fringes_outside_margins);

      Fset_window_scroll_bars (window,
			       b->scroll_bar_width,
			       b->vertical_scroll_bar_type, Qnil);

      Fset_window_margins (window,
			   b->left_margin_cols, b->right_margin_cols);
    }

52617:f8adaf14f570

    {
      /* Set left and right marginal area width etc. from buffer.  */

      /* This may call adjust_window_margins three times, so
	 temporarily disable window margins.  */
      Lisp_Object save_left = w->left_margin_cols;
      Lisp_Object save_right = w->right_margin_cols;

      w->left_margin_cols = w->right_margin_cols = Qnil;

      Fset_window_fringes (window,
			   b->left_fringe_width, b->right_fringe_width,
			   b->fringes_outside_margins);

      Fset_window_scroll_bars (window,
			       b->scroll_bar_width,
			       b->vertical_scroll_bar_type, Qnil);

      w->left_margin_cols = save_left;
      w->right_margin_cols = save_right;

      Fset_window_margins (window,
			   b->left_margin_cols, b->right_margin_cols);
    }