Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org

2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b263892c1e..ab5621b9664 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2014-10-03  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * font.c (font_list_entities): Do not add empty vector to font cache.
+        (font_matching_entity): Likewise.  If matching entity is found, insert
+        1-item vector with this entity instead of an entity itself (Bug#17125).
+
+2014-10-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_by_lines): Call reseat_1 after moving the
+        iterator backwards, to resync the bidi iterator.  (Bug#18584)
+
+2014-10-03  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Consistently use min and max macros from lisp.h.
         * coding.c (min, max):
         * font.c (MAX):
diff --git a/src/xdisp.c b/src/xdisp.c
index 8176d81cd6e..bf73de69669 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9752,6 +9752,7 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
               back_to_previous_visible_line_start (it);
               it->vpos--;
             }
+          reseat_1 (it, it->current.pos, 1);
         }
       else
         RESTORE_IT (it, it, it2data);