Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e5669da5196..32a14ef9e62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2012-11-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Skip step 2 only if point is not
+        between bpos_covered and bpos_max.  This fixes cursor display when
+        several display strings follow each other.
+
+        * .gdbinit (pgx): If the glyph's object is a string, display the
+        pointer to string data, rather than the value of the string object
+        itself (which barfs under CHECK_LISP_OBJECT_TYPE).
+
+        * indent.c (Fvertical_motion): If the starting position is covered
+        by a display string, return to one position before that, to avoid
+        overshooting it inside move_it_to.  (Bug#12930)
+
 2012-11-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * frame.h (struct frame): Remove display_preempted member