emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r113938: Fix a minor issue with loading zlib DLL on


From: Eli Zaretskii
Subject: [Emacs-diffs] trunk r113938: Fix a minor issue with loading zlib DLL on MS-Windows.
Date: Sat, 17 Aug 2013 17:18:12 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 113938
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-17 20:18:07 +0300
message:
  Fix a minor issue with loading zlib DLL on MS-Windows.
  
   src/decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value
   of zlib_initialized according to the results of calling
   init_zlib_functions.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-16 22:32:24 +0000
+++ b/src/ChangeLog     2013-08-17 17:18:07 +0000
@@ -1,3 +1,9 @@
+2013-08-17  Eli Zaretskii  <address@hidden>
+
+       * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value
+       of zlib_initialized according to the results of calling
+       init_zlib_functions.
+
 2013-08-16  Lars Magne Ingebrigtsen  <address@hidden>
 
        * image.c: Implement an ImageMagick per-image cache.

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2013-08-16 05:15:51 +0000
+++ b/src/decompress.c  2013-08-17 17:18:07 +0000
@@ -116,7 +116,8 @@
   else
     {
       Lisp_Object status;
-      status = init_zlib_functions () ? Qt : Qnil;
+      zlib_initialized = init_zlib_functions ();
+      status = zlib_initialized ? Qt : Qnil;
       Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache);
       return status;
     }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]