[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114425: Fix bug #15365 with aborts in try_window_id
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r114425: Fix bug #15365 with aborts in try_window_id. |
Date: |
Sun, 22 Sep 2013 07:13:53 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114425
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15365
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-22 10:13:14 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-22 06:22:05 +0000
+++ b/src/ChangeLog 2013-09-22 07:13:14 +0000
@@ -1,3 +1,9 @@
+2013-09-22 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
Fix syntax.h bug introduced by recent INLINE change.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-09-18 06:48:11 +0000
+++ b/src/xdisp.c 2013-09-22 07:13:14 +0000
@@ -17291,8 +17291,6 @@
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 @@
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;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114425: Fix bug #15365 with aborts in try_window_id.,
Eli Zaretskii <=