diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-07-01 20:07:24 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-07-01 20:07:24 +0300 |
| commit | ff6e6a42fcf9a3c7d42bd305d6a1f5c9079764ee (patch) | |
| tree | f9ceafce034b2309a680b211c82f8efbbf5ab4c3 /src/window.h | |
| parent | 3737a8efcf3a705c99a807e9c8574a89036dc3f3 (diff) | |
| download | emacs-ff6e6a42fcf9a3c7d42bd305d6a1f5c9079764ee.tar.gz | |
Fix bug #17892 with mode/header line and display margins.
src/dispnew.c (prepare_desired_row): Accept 2 additional arguments:
the window whose glyph row is being prepared and a flag whether it
is for mode/header line. Make sure the glyph row's marginal areas
are in sync with what the window wants.
src/xdisp.c (display_line, display_mode_line): Call
prepare_desired_row with additional arguments, as appropriate.
src/dispextern.h (prepare_desired_row): Adjust prototype.
src/window.h: Improve commentary of the marginal columns.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/window.h b/src/window.h index bdc5dddb7e5..b9c2b1f5ba8 100644 --- a/src/window.h +++ b/src/window.h @@ -271,8 +271,10 @@ struct window int left_fringe_width; int right_fringe_width; - /* Width of left and right marginal areas in columns. - A value of 0 means no margin. */ + /* Requested width of left and right marginal areas in columns. A + value of 0 means no margin. The actual values are recorded in + the window's glyph matrix, in the left_margin_glyphs and + right_margin_glyphs members. */ int left_margin_cols; int right_margin_cols; |