diff options
| author | Paul Eggert | 2014-01-25 16:32:30 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-01-25 16:32:30 -0800 |
| commit | 4f8c23b12913774c1a6cec56eb2bc60b17026af3 (patch) | |
| tree | cfb5eee9b8d60660b70852a80b2b4d5097af21be /src/ChangeLog | |
| parent | ed85dee69d1ba238407326f67b0a25eaa3ddaab7 (diff) | |
| download | emacs-4f8c23b12913774c1a6cec56eb2bc60b17026af3.tar.gz emacs-4f8c23b12913774c1a6cec56eb2bc60b17026af3.zip | |
Fix crash with insert-file-contents and misdecoded text.
* fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK
before invoking decode_coding_gap, since there's just one block.
Fixes: debbugs:16286
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7ed097976a1..e875bc8a40d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-01-26 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix crash with insert-file-contents and misdecoded text (Bug#16286). | ||
| 4 | * fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK | ||
| 5 | before invoking decode_coding_gap, since there's just one block. | ||
| 6 | |||
| 1 | 2014-01-25 Martin Rudalics <rudalics@gmx.at> | 7 | 2014-01-25 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | Fix handling of face attributes in Fx_create_frame (Bug#16529). | 9 | Fix handling of face attributes in Fx_create_frame (Bug#16529). |