Mercurial > emacs

comparison src/xdisp.c @ 83331:efa9e4606e7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-449 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-450 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-451 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-452 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-453 Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix. * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-454 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-455 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-456 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-457 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-458 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-459 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-460 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-461 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-462 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-463 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-464 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-465 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-466 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-467 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-468 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-83 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-84 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-85 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-86 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-87 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-371
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 05 Jul 2005 22:12:55 +0000
parents ebfb2856c8e6 443cb2507f88
children 6c13700d1c13
comparison
equal deleted inserted replaced
83330:233c9974025b 83331:efa9e4606e7e
12746 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); 12746 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
12747 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height; 12747 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
12748 12748
12749 if ((w->cursor.y < this_scroll_margin 12749 if ((w->cursor.y < this_scroll_margin
12750 && CHARPOS (pos) > BEGV) 12750 && CHARPOS (pos) > BEGV)
12751 /* Old redisplay didn't take scroll margin into account at the bottom, 12751 /* rms: considering make_cursor_line_fully_visible_p here
12752 but then global-hl-line-mode doesn't scroll. KFS 2004-06-14 */ 12752 seems to give wrong results. We don't want to recenter
12753 || (w->cursor.y + (make_cursor_line_fully_visible_p 12753 when the last line is partly visible, we want to allow
12754 ? cursor_height + this_scroll_margin 12754 that case to be handled in the usual way. */
12755 : 1)) > it.last_visible_y) 12755 || (w->cursor.y + 1) > it.last_visible_y)
12756 { 12756 {
12757 w->cursor.vpos = -1; 12757 w->cursor.vpos = -1;
12758 clear_glyph_matrix (w->desired_matrix); 12758 clear_glyph_matrix (w->desired_matrix);
12759 return -1; 12759 return -1;
12760 } 12760 }
22407 int x0, x1, y0, y1; 22407 int x0, x1, y0, y1;
22408 22408
22409 window_box_edges (w, -1, &x0, &y0, &x1, &y1); 22409 window_box_edges (w, -1, &x0, &y0, &x1, &y1);
22410 y1 -= 1; 22410 y1 -= 1;
22411 22411
22412 if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
22413 x1 -= 1;
22414
22412 FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1); 22415 FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
22413 } 22416 }
22414 else if (!WINDOW_LEFTMOST_P (w) 22417 else if (!WINDOW_LEFTMOST_P (w)
22415 && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) 22418 && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
22416 { 22419 {
22417 int x0, x1, y0, y1; 22420 int x0, x1, y0, y1;
22418 22421
22419 window_box_edges (w, -1, &x0, &y0, &x1, &y1); 22422 window_box_edges (w, -1, &x0, &y0, &x1, &y1);
22420 y1 -= 1; 22423 y1 -= 1;
22424
22425 if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
22426 x0 -= 1;
22421 22427
22422 FRAME_RIF (f)->draw_vertical_window_border (w, x0, y0, y1); 22428 FRAME_RIF (f)->draw_vertical_window_border (w, x0, y0, y1);
22423 } 22429 }
22424 } 22430 }
22425 22431