Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 85eb113db828dd157d508b9020490b50e117c2c4..2cf21c9b4ad9d895f30f04ab354e49d5e0528b3a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (pos_visible_p): Fix up the X coordinate for
+       right-to-left screen lines.  (Bug#19473)
+
+2015-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32proc.c (Fw32_get_codepage_charset): Doc fix.  (Bug#19458)
+
 2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify setfattr use by assuming GNU make