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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1031 emacs/src/xdisp.c:1.1032
*** emacs/src/xdisp.c:1.1031    Mon Jul  4 16:06:38 2005
--- emacs/src/xdisp.c   Wed Jul 13 09:36:12 2005
***************
*** 11294,11300 ****
    window_height = window_box_height (w);
    if (row->height >= window_height)
      {
!       if (!force_p || w->vscroll)
        return 1;
      }
    return 0;
--- 11294,11300 ----
    window_height = window_box_height (w);
    if (row->height >= window_height)
      {
!       if (!force_p || MINI_WINDOW_P (w) || w->vscroll)
        return 1;
      }
    return 0;
***************
*** 12729,12735 ****
      }
  
    /* Don't let the cursor end in the scroll margins.  */
!   if (check_margins)
      {
        int this_scroll_margin, cursor_height;
  
--- 12729,12736 ----
      }
  
    /* Don't let the cursor end in the scroll margins.  */
!   if (check_margins
!       && !MINI_WINDOW_P (w))
      {
        int this_scroll_margin, cursor_height;