diff options
| author | Joakim Verona | 2013-08-26 18:42:27 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-26 18:42:27 +0200 |
| commit | 789fc3346ed7f2e8a2c3ba09502bce59893f1167 (patch) | |
| tree | 2118ffbdec816f340efa40ae88eb8c69577c7095 /src | |
| parent | ffb49902dad1e9f8ae8083732c395e4103ba0561 (diff) | |
| parent | 447218dd746e66544176995f1c791609b632a398 (diff) | |
| download | emacs-789fc3346ed7f2e8a2c3ba09502bce59893f1167.tar.gz emacs-789fc3346ed7f2e8a2c3ba09502bce59893f1167.zip | |
merge from trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5f0bb86c3ee..37d3419532b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | Fix recovering from possible decompression error. Since | 30 | Fix recovering from possible decompression error. Since |
| 31 | insert_from_gap doesn't always move point, we can't use PT as | 31 | insert_from_gap doesn't always move point, we can't use PT as |
| 32 | the position where the partially decompressed data ends, and | 32 | the position where the partially decompressed data ends, and |
| 33 | should count how may bytes was produced so far. | 33 | should count how many bytes was produced so far. |
| 34 | * decompress.c (struct decompress_unwind_data): Add nbytes member. | 34 | * decompress.c (struct decompress_unwind_data): Add nbytes member. |
| 35 | (unwind_decompress): Really delete partially uncompressed data. | 35 | (unwind_decompress): Really delete partially uncompressed data. |
| 36 | (Fzlib_decompress_region): Take decompressed data size into account. | 36 | (Fzlib_decompress_region): Take decompressed data size into account. |