diff options
| author | Karoly Lorentey | 2005-05-28 21:04:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-05-28 21:04:38 +0000 |
| commit | 93d7a3669284221c9272784875f69c047873fe04 (patch) | |
| tree | 853af54aa3e46a73bd248dc7033dbf4e39132f9f /src/window.c | |
| parent | b4bb3cbc7caca5c9c207d9ed42cacb978790af67 (diff) | |
| parent | 9594f9294b16c3e828b593c4cc9159b6328e1aa3 (diff) | |
| download | emacs-93d7a3669284221c9272784875f69c047873fe04.tar.gz emacs-93d7a3669284221c9272784875f69c047873fe04.zip | |
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
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 67cbd73bc50..83d99cf67ba 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -546,7 +546,7 @@ display margins, fringes, header line, and/or mode line. */) | |||
| 546 | + WINDOW_LEFT_FRINGE_COLS (w)), | 546 | + WINDOW_LEFT_FRINGE_COLS (w)), |
| 547 | make_number (WINDOW_TOP_EDGE_LINE (w) | 547 | make_number (WINDOW_TOP_EDGE_LINE (w) |
| 548 | + WINDOW_HEADER_LINE_LINES (w)), | 548 | + WINDOW_HEADER_LINE_LINES (w)), |
| 549 | make_number (WINDOW_RIGHT_EDGE_COL (w) | 549 | make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) |
| 550 | - WINDOW_RIGHT_MARGIN_COLS (w) | 550 | - WINDOW_RIGHT_MARGIN_COLS (w) |
| 551 | - WINDOW_RIGHT_FRINGE_COLS (w)), | 551 | - WINDOW_RIGHT_FRINGE_COLS (w)), |
| 552 | make_number (WINDOW_BOTTOM_EDGE_LINE (w) | 552 | make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
| @@ -570,7 +570,7 @@ display margins, fringes, header line, and/or mode line. */) | |||
| 570 | + WINDOW_LEFT_FRINGE_WIDTH (w)), | 570 | + WINDOW_LEFT_FRINGE_WIDTH (w)), |
| 571 | make_number (WINDOW_TOP_EDGE_Y (w) | 571 | make_number (WINDOW_TOP_EDGE_Y (w) |
| 572 | + WINDOW_HEADER_LINE_HEIGHT (w)), | 572 | + WINDOW_HEADER_LINE_HEIGHT (w)), |
| 573 | make_number (WINDOW_RIGHT_EDGE_X (w) | 573 | make_number (WINDOW_BOX_RIGHT_EDGE_X (w) |
| 574 | - WINDOW_RIGHT_MARGIN_WIDTH (w) | 574 | - WINDOW_RIGHT_MARGIN_WIDTH (w) |
| 575 | - WINDOW_RIGHT_FRINGE_WIDTH (w)), | 575 | - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
| 576 | make_number (WINDOW_BOTTOM_EDGE_Y (w) | 576 | make_number (WINDOW_BOTTOM_EDGE_Y (w) |