Fix bug #15365 with aborts in try_window_id.

 src/xdisp.c (try_window_id): Don't abort if cursor row could not be
 found (which can legitimately happen when the glyph row at the
 window start is disabled in the current_matrix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 084ae983b6f027d31d3121dffb1c59e7364290ca..1442650d43266cdf0aa16baf3904f81390b97d24 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (try_window_id): Don't abort if cursor row could not be
+       found (which can legitimately happen when the glyph row at the
+       window start is disabled in the current_matrix.  (Bug#15365)
+
 2013-09-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix syntax.h bug introduced by recent INLINE change.

diff --git a/src/xdisp.c b/src/xdisp.c
index c4f7b205119f4d50bc8a561c1a91c0aedfd9d646..bfd86758a1e558b869e6eaa91b80c750a8dfccce 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17291,8 +17291,6 @@ try_window_id (struct window *w)
          row = row_containing_pos (w, PT, r0, NULL, 0);
          if (row)
            set_cursor_from_row (w, row, current_matrix, 0, 0, 0, 0);
-         else
-           emacs_abort ();
          return 1;
        }
     }
@@ -17333,8 +17331,6 @@ try_window_id (struct window *w)
          row = row_containing_pos (w, PT, r0, NULL, 0);
          if (row)
            set_cursor_from_row (w, row, current_matrix, 0, 0, 0, 0);
-         else
-           emacs_abort ();
          return 2;
        }
     }