2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3dbddc9b215..83dc66a1720 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-15  Johan Bockgård  <bojohan@gnu.org>
+
+        * xdisp.c (try_cursor_movement): Only check for exact match if
+        cursor hpos found by set_cursor_from_row is valid.  (Bug#9495)
+
 2011-09-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove unused external symbols.
diff --git a/src/xdisp.c b/src/xdisp.c
index 1ccaa0641b0..0f842b8673e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14627,7 +14627,10 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                      is set, we are done.  */
                   at_zv_p =
                     MATRIX_ROW (w->current_matrix, w->cursor.vpos)->ends_at_zv_p;
-                  if (!at_zv_p)
+                  if (rv && !at_zv_p
+                      && w->cursor.hpos >= 0
+                      && w->cursor.hpos < MATRIX_ROW_USED (w->current_matrix,
+                                                           w->cursor.vpos))
                     {
                       struct glyph_row *candidate =
                         MATRIX_ROW (w->current_matrix, w->cursor.vpos);