From 76880d884d87d0bc674249e292ccda70f31cca0e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 22 Sep 2013 10:13:14 +0300 Subject: [PATCH] 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. --- src/ChangeLog | 6 ++++++ src/xdisp.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 084ae983b6f..1442650d432 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-09-22 Eli Zaretskii + + * 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 Fix syntax.h bug introduced by recent INLINE change. diff --git a/src/xdisp.c b/src/xdisp.c index c4f7b205119..bfd86758a1e 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; } } -- 2.39.2