diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-16 21:29:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-16 21:29:04 +0200 |
| commit | 5e6d03b2abd37151ae1329c4b98edfa8242d2f0f (patch) | |
| tree | b7ad76bb208c632485fc6f9c9055b571f8ba139a /src/xdisp.c | |
| parent | 39cb42c6213248c07f298be04c79b606be7d431d (diff) | |
| download | emacs-5e6d03b2abd37151ae1329c4b98edfa8242d2f0f.tar.gz | |
Fix compilation errors introduced by changes in extend_face_to_end_of_line.
src/xdisp.c (extend_face_to_end_of_line): Don't reference tool_bar_window
in GTK and NS builds, they don't have this member of struct frame.
Fixes: debbugs:16165
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index a0332a16503..0d3f473b6f1 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18866,8 +18866,11 @@ extend_face_to_end_of_line (struct it *it) /* Mode line and the header line don't have margins, and likewise the frame's tool-bar window, if there is any. */ if (!(it->glyph_row->mode_line_p +#if defined (HAVE_WINDOW_SYSTEM) && ! defined (USE_GTK) && ! defined (HAVE_NS) || (WINDOWP (f->tool_bar_window) - && it->w == XWINDOW (f->tool_bar_window)))) + && it->w == XWINDOW (f->tool_bar_window)) +#endif + )) { if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0 && it->glyph_row->used[LEFT_MARGIN_AREA] == 0) |