From 3341db6299a2bb63a641210d72f73e93e2d1542e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 21 Sep 2011 04:13:18 -0400 Subject: Fix assertion failure when displaying stretch glyphs under linum-mode. src/xdisp.c (pop_it): Allow it->object that is a cons cell to pass the xassert test. src/dispextern.h (struct it): Update the comment documenting what can it->OBJECT be. --- src/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 17b53216e83..dff41f1dbbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2011-09-21 Eli Zaretskii + + * xdisp.c (pop_it): Allow it->object that is a cons cell to pass + the xassert test. + + * dispextern.h (struct it): Update the comment documenting what + can it->OBJECT be. + 2011-09-20 Eli Zaretskii * xdisp.c (set_cursor_from_row): If the row ends in a newline from -- cgit v1.3