diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-09-21 04:13:18 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-09-21 04:13:18 -0400 |
| commit | 3341db6299a2bb63a641210d72f73e93e2d1542e (patch) | |
| tree | 0c10f907b173a58f0616c6413e11de9978224924 /src/ChangeLog | |
| parent | b523dc2054c5b53080082122ed4f639b59632bad (diff) | |
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.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
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 <eliz@gnu.org> + + * 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 <eliz@gnu.org> * xdisp.c (set_cursor_from_row): If the row ends in a newline from |