diff options
| author | Miles Bader | 2005-05-26 05:42:19 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-05-26 05:42:19 +0000 |
| commit | d2eeec7fb90dc54c4b08e85f452a23317c0ee65d (patch) | |
| tree | cd13677b902ee91ff96c5f43ca30ae2aba828312 /src/window.c | |
| parent | 5611ba87dd81c98d2cc00a4d01e19db3d26cf9d5 (diff) | |
| parent | c0e9b2d0ec9cb343733243371efecf77722b067f (diff) | |
| download | emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.gz emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
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 454d712726c..35aeb4411ae 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -544,7 +544,7 @@ display margins, fringes, header line, and/or mode line. */) | |||
| 544 | + WINDOW_LEFT_FRINGE_COLS (w)), | 544 | + WINDOW_LEFT_FRINGE_COLS (w)), |
| 545 | make_number (WINDOW_TOP_EDGE_LINE (w) | 545 | make_number (WINDOW_TOP_EDGE_LINE (w) |
| 546 | + WINDOW_HEADER_LINE_LINES (w)), | 546 | + WINDOW_HEADER_LINE_LINES (w)), |
| 547 | make_number (WINDOW_RIGHT_EDGE_COL (w) | 547 | make_number (WINDOW_BOX_RIGHT_EDGE_COL (w) |
| 548 | - WINDOW_RIGHT_MARGIN_COLS (w) | 548 | - WINDOW_RIGHT_MARGIN_COLS (w) |
| 549 | - WINDOW_RIGHT_FRINGE_COLS (w)), | 549 | - WINDOW_RIGHT_FRINGE_COLS (w)), |
| 550 | make_number (WINDOW_BOTTOM_EDGE_LINE (w) | 550 | make_number (WINDOW_BOTTOM_EDGE_LINE (w) |
| @@ -568,7 +568,7 @@ display margins, fringes, header line, and/or mode line. */) | |||
| 568 | + WINDOW_LEFT_FRINGE_WIDTH (w)), | 568 | + WINDOW_LEFT_FRINGE_WIDTH (w)), |
| 569 | make_number (WINDOW_TOP_EDGE_Y (w) | 569 | make_number (WINDOW_TOP_EDGE_Y (w) |
| 570 | + WINDOW_HEADER_LINE_HEIGHT (w)), | 570 | + WINDOW_HEADER_LINE_HEIGHT (w)), |
| 571 | make_number (WINDOW_RIGHT_EDGE_X (w) | 571 | make_number (WINDOW_BOX_RIGHT_EDGE_X (w) |
| 572 | - WINDOW_RIGHT_MARGIN_WIDTH (w) | 572 | - WINDOW_RIGHT_MARGIN_WIDTH (w) |
| 573 | - WINDOW_RIGHT_FRINGE_WIDTH (w)), | 573 | - WINDOW_RIGHT_FRINGE_WIDTH (w)), |
| 574 | make_number (WINDOW_BOTTOM_EDGE_Y (w) | 574 | make_number (WINDOW_BOTTOM_EDGE_Y (w) |