procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #15365 with aborts in try_window_id.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2013-09-22 10:13:14 +03:00
parent c6cfd9101e
commit 76880d884d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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.

4
src/xdisp.c
View file

@ -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;
}
}