[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115554: Fix compilation errors introduced by change
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115554: Fix compilation errors introduced by changes in extend_face_to_end_of_line. |
Date: |
Mon, 16 Dec 2013 19:29:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115554
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16165
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-16 21:29:04 +0200
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-16 18:09:36 +0000
+++ b/src/ChangeLog 2013-12-16 19:29:04 +0000
@@ -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.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-12-16 18:09:36 +0000
+++ b/src/xdisp.c 2013-12-16 19:29:04 +0000
@@ -18866,8 +18866,11 @@
/* 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115554: Fix compilation errors introduced by changes in extend_face_to_end_of_line.,
Eli Zaretskii <=