diff options
| author | Eli Zaretskii | 2011-11-18 14:21:42 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-18 14:21:42 +0200 |
| commit | 015137db608f0678112ae9a69a1a52889d56161d (patch) | |
| tree | 08d432ad5df33dd7158a331d9dcebcebf0a11b88 /src/ChangeLog | |
| parent | a2addb04643c0631c1c3a79116b5e54f9f302afc (diff) | |
| download | emacs-015137db608f0678112ae9a69a1a52889d56161d.tar.gz emacs-015137db608f0678112ae9a69a1a52889d56161d.zip | |
Fix another crash due to incorrect hash value of glyph rows, bug #10035.
src/dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the
hash values of the two rows.
(copy_row_except_pointers): Preserve the used[] arrays and the
hash values of the two rows.
src/xdisp.c (row_hash): New function, body extracted from
compute_line_metrics.
(compute_line_metrics): Call row_hash, instead of computing the
hash code inline.
src/dispnew.c (verify_row_hash): Call row_hash for computing the
hash code of a row, instead of duplicating code from xdisp.c.
src/dispextern.h (row_hash): Add prototype.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 81f7fbbdc29..b394c37354f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2011-11-18 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the | ||
| 4 | hash values of the two rows. | ||
| 5 | (copy_row_except_pointers): Preserve the used[] arrays and the | ||
| 6 | hash values of the two rows. (Bug#10035) | ||
| 7 | |||
| 8 | * xdisp.c (row_hash): New function, body extracted from | ||
| 9 | compute_line_metrics. | ||
| 10 | (compute_line_metrics): Call row_hash, instead of computing the | ||
| 11 | hash code inline. | ||
| 12 | |||
| 13 | * dispnew.c (verify_row_hash): Call row_hash for computing the | ||
| 14 | hash code of a row, instead of duplicating code from xdisp.c. | ||
| 15 | |||
| 16 | * dispextern.h (row_hash): Add prototype. | ||
| 17 | |||
| 1 | 2011-11-18 Tassilo Horn <tassilo@member.fsf.org> | 18 | 2011-11-18 Tassilo Horn <tassilo@member.fsf.org> |
| 2 | 19 | ||
| 3 | * frame.c (delete_frame): Don't delete the terminal when the last | 20 | * frame.c (delete_frame): Don't delete the terminal when the last |