diff options
| author | Eli Zaretskii <[email protected]> | 2013-09-22 10:13:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2013-09-22 10:13:14 +0300 |
| commit | 76880d884d87d0bc674249e292ccda70f31cca0e (patch) | |
| tree | d11641e939732ac9c621fbf2d26a7ff72bb77dc9 | |
| parent | c6cfd9101e70010bcd4ba6831b0d42ebc84728fe (diff) | |
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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 084ae983b6..1442650d43 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-09-22 Eli Zaretskii <[email protected]> + + * 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 <[email protected]> Fix syntax.h bug introduced by recent INLINE change. diff --git a/src/xdisp.c b/src/xdisp.c index c4f7b20511..bfd86758a1 100644 --- 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; } } |