Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a49b8b779906a20411f1134d0ccdc93059477f1..5ced4734bc9a49a53375db07d665ba3bb6d0b2f6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (produce_image_glyph): Fix display of images in R2L
+       screen lines: prepend the new glyph to the ones already there
+       instead of appending it.
+
 2015-01-14  Eli Zaretskii  <eliz@gnu.org>
 
        * w32fns.c (w32_set_title_bar_text): New function, including