Commit 5e6d03b2 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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
parent 39cb42c6
......@@ -3,6 +3,8 @@
* xdisp.c (Fmove_point_visually): Fix subtle bugs in the fallback
code, revealed in presence of R2L characters, character
compositions, and display vectors. A better fix for Bug#16148.
(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.
* dispextern.h (struct composition_it): Correct a comment for the
'width' member.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment