Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org.

1 files changed, 32 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a0ac451f35b..c28f8a607aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2014-08-01  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix display of R2L lines when the last character fits only partially.
+        See http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00476.html
+        for the details.
+        * xdisp.c (extend_face_to_end_of_line): If the last glyph of an
+        R2L row is visible only partially, give the row a negative x
+        offset.
+        (display_line): Fix the calculation of the glyph whose pixel width
+        is used to decide whether the last produced glyph fits on the
+        line.  When the last glyph fits only partially, give the row a
+        negative x offset.
+
+        Fix hscroll of R2L lines that begin with a TAB or another wide glyph.
+        * xdisp.c (append_stretch_glyph): In a R2L glyph row, decrease the
+        pixel width of the first glyph that is hscrolled from display.
+        (display_line): In R2L glyph rows, don't give a negative offset to
+        row->x when the first glyph begins before first_visible_x.
+
+        * xdisp.c (display_line): If called with iterator set up to write
+        to a marginal area, delay the call to handle_line_prefix until we
+        switch back to the text area.  (Bug#18035)
+
+        * .gdbinit (xwindow): The members total_cols, total_lines,
+        left_col, and top_line are C integers (and has been so for the
+        last 1.5 years).
+
+2014-08-01  Andreas Schwab  <schwab@suse.de>
+
+        * macros.c (Fstart_kbd_macro): Initialize kbd_macro_ptr and
+        kbd_macro_end together with kbd_macro_buffer.  (Bug#18140)
+
 2014-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * atimer.c (toplevel) [HAVE_TIMERFD]: Include errno.h.