# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1064447565 0
# Node ID f8adaf14f57011930754c341131d6cddefaf2b24
# Parent  3c1bf15e7a4d490f2b4c9ce3f7c80ecbfeff9507
(set_window_buffer): Fix redisplay problems when
switching between buffers with different display margin widths.

diff -r 3c1bf15e7a4d -r f8adaf14f570 src/window.c
--- a/src/window.c	Wed Sep 24 23:52:11 2003 +0000
+++ b/src/window.c	Wed Sep 24 23:52:45 2003 +0000
@@ -2853,6 +2853,9 @@
 
       /* 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,
@@ -2863,6 +2866,9 @@
 			       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);
     }