Mercurial > emacs
diff src/window.c @ 83308:63b7247f4be6
Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-348
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 28 May 2005 21:04:38 +0000 |
parents | effe22690419 5283bd0173e6 |
children | e58cb448e07c |
line wrap: on
line diff
--- a/src/window.c Fri May 20 17:44:36 2005 +0000 +++ b/src/window.c Sat May 28 21:04:38 2005 +0000 @@ -546,7 +546,7 @@ + WINDOW_LEFT_FRINGE_COLS (w)), make_number (WINDOW_TOP_EDGE_LINE (w) + WINDOW_HEADER_LINE_LINES (w)), - make_number (WINDOW_RIGHT_EDGE_COL (w) + make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) - WINDOW_RIGHT_MARGIN_COLS (w) - WINDOW_RIGHT_FRINGE_COLS (w)), make_number (WINDOW_BOTTOM_EDGE_LINE (w) @@ -570,7 +570,7 @@ + WINDOW_LEFT_FRINGE_WIDTH (w)), make_number (WINDOW_TOP_EDGE_Y (w) + WINDOW_HEADER_LINE_HEIGHT (w)), - make_number (WINDOW_RIGHT_EDGE_X (w) + make_number (WINDOW_BOX_RIGHT_EDGE_X (w) - WINDOW_RIGHT_MARGIN_WIDTH (w) - WINDOW_RIGHT_FRINGE_WIDTH (w)), make_number (WINDOW_BOTTOM_EDGE_Y (w)