procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-13 23:31:51 +02:00
commit d9369d9a21
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-08-13 Paul Eggert <eggert@cs.ucla.edu>
* decompress.c: Minor simplifications.
(Fzlib_decompress_region): Don't bother verifying
that avail_out <= UINT_MAX, as that was confusing.
Mention the restriction in a comment instead.
Prefer 'int' to 'ptrdiff_t' when 'int' is wide enough.
2013-08-13 Jan Djärv <jan.h.d@swipnet.se>
* nsmenu.m (x_activate_menubar): Check for OSX >= 10.5

8
src/decompress.c
View file

@ -183,12 +183,10 @@ This function can be called only in unibyte buffers. */)
{
/* Maximum number of bytes that one 'inflate' call should read and write.
Do not make avail_out too large, as that might unduly delay C-g.
In any case zlib requires that these values not exceed UINT_MAX. */
zlib requires that avail_in and avail_out not exceed UINT_MAX. */
ptrdiff_t avail_in = min (iend - pos_byte, UINT_MAX);
enum { avail_out = 1 << 14 };
verify (avail_out <= UINT_MAX);
ptrdiff_t decompressed;
int avail_out = 16 * 1024;
int decompressed;
if (GAP_SIZE < avail_out)
make_gap (avail_out - GAP_SIZE);