diff options
| author | Joakim Verona | 2013-08-13 18:36:39 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 18:36:39 +0200 |
| commit | c5f293d04763b207b3bb1120230c10f8096dc232 (patch) | |
| tree | f2cb34e2c84676c1da3b8bf43544889b67a67b39 /src/decompress.c | |
| parent | cb0b8a957cbf53f35179f571841c8cda2c276959 (diff) | |
| parent | 866c710eeb75ce47767442952028d79b76c1606a (diff) | |
| download | emacs-c5f293d04763b207b3bb1120230c10f8096dc232.tar.gz emacs-c5f293d04763b207b3bb1120230c10f8096dc232.zip | |
merge from trunk
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/decompress.c b/src/decompress.c index b7cd8a6c404..452a9210402 100644 --- a/src/decompress.c +++ b/src/decompress.c | |||
| @@ -146,6 +146,8 @@ This function can be called only in unibyte buffers. */) | |||
| 146 | #ifdef WINDOWSNT | 146 | #ifdef WINDOWSNT |
| 147 | if (!zlib_initialized) | 147 | if (!zlib_initialized) |
| 148 | zlib_initialized = init_zlib_functions (); | 148 | zlib_initialized = init_zlib_functions (); |
| 149 | if (!zlib_initialized) | ||
| 150 | return Qnil; | ||
| 149 | #endif | 151 | #endif |
| 150 | 152 | ||
| 151 | /* This is a unibyte buffer, so character positions and bytes are | 153 | /* This is a unibyte buffer, so character positions and bytes are |