[Emacs-diffs] Changes to emacs/src/dispnew.c [lexbind]

[Miles Bader]

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.308.2.9 emacs/src/dispnew.c:1.308.2.10
*** emacs/src/dispnew.c:1.308.2.9       Tue Apr 27 14:08:49 2004
--- emacs/src/dispnew.c Fri Jul 23 04:42:22 2004
***************
*** 579,585 ****
        int width = XFASTINT (w->total_cols);
        double d = max (0, XFLOATINT (margin));
        d = min (width / 2 - 1, d);
!       n = (int) ((double) total_glyphs / width * d);
      }
    else
      n = 0;
--- 579,585 ----
        int width = XFASTINT (w->total_cols);
        double d = max (0, XFLOATINT (margin));
        d = min (width / 2 - 1, d);
!       n = (int) ((double) total_glyphs / width * d) * w->ncols_scale_factor;
      }
    else
      n = 0;
***************
*** 1911,1920 ****
              || dim.width != w->desired_matrix->matrix_w
              || dim.height != w->desired_matrix->matrix_h
              || (margin_glyphs_to_reserve (w, dim.width,
!                                           w->right_margin_cols)
                  != w->desired_matrix->left_margin_glyphs)
              || (margin_glyphs_to_reserve (w, dim.width,
!                                           w->left_margin_cols)
                  != w->desired_matrix->right_margin_glyphs))
            *window_change_flags |= CHANGED_LEAF_MATRIX;
  
--- 1911,1920 ----
              || dim.width != w->desired_matrix->matrix_w
              || dim.height != w->desired_matrix->matrix_h
              || (margin_glyphs_to_reserve (w, dim.width,
!                                           w->left_margin_cols)
                  != w->desired_matrix->left_margin_glyphs)
              || (margin_glyphs_to_reserve (w, dim.width,
!                                           w->right_margin_cols)
                  != w->desired_matrix->right_margin_glyphs))
            *window_change_flags |= CHANGED_LEAF_MATRIX;
  
***************
*** 1982,1988 ****
        int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
        int window_pixel_height = window_box_height (w) + abs (w->vscroll);
        return (((window_pixel_height + ch_height - 1)
!              / ch_height)
              /* One partially visible line at the top and
                 bottom of the window.  */
              + 2
--- 1982,1988 ----
        int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
        int window_pixel_height = window_box_height (w) + abs (w->vscroll);
        return (((window_pixel_height + ch_height - 1)
!              / ch_height) * w->nrows_scale_factor
              /* One partially visible line at the top and
                 bottom of the window.  */
              + 2
***************
*** 2010,2016 ****
  
        /* Compute number of glyphs needed in a glyph row.  */
        return (((window_pixel_width + ch_width - 1)
!              / ch_width)
              /* 2 partially visible columns in the text area.  */
              + 2
              /* One partially visible column at the right
--- 2010,2016 ----
  
        /* Compute number of glyphs needed in a glyph row.  */
        return (((window_pixel_width + ch_width - 1)
!              / ch_width) * w->ncols_scale_factor
              /* 2 partially visible columns in the text area.  */
              + 2
              /* One partially visible column at the right