Merge from mainline.

1 files changed, 78 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c0d81fc1248..ee2db310562 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-04  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * term.c (vfatal): Remove stray call to va_end.
         It's not needed and the C Standard doesn't allow it here anyway.
@@ -119,6 +119,83 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+
+        * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
+        New version that can reserve upto 2GB of heap space.
+
+2011-05-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
+
+2011-05-05  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to
+        `gnutls_certificate_set_x509_key_file'.
+
+2011-05-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/image.$(O), $(BLD)/process.$(O)):
+        Update dependencies.
+
+2011-05-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnutls.h (emacs_gnutls_write, emacs_gnutls_read):
+        * gnutls.c (emacs_gnutls_write, emacs_gnutls_read):
+        Remove unused parameter `fildes'.
+        * process.c (read_process_output, send_process): Don't pass it.
+
+2011-05-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        Fix previous change: the library cache is defined in w32.c.
+        * image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop.
+        (Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI".
+
+2011-05-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        Implement dynamic loading of GnuTLS on Windows.
+
+        * gnutls.h (GNUTLS_EMACS_ERROR_NOT_LOADED): New macro.
+        (emacs_gnutls_write, emacs_gnutls_read): Mark as extern.
+        (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
+        Declare.
+
+        * gnutls.c (Qgnutls_dll): Define.
+        (DEF_GNUTLS_FN, LOAD_GNUTLS_FN): New macros.
+        (gnutls_*): Declare function pointers.
+        (init_gnutls_functions): New function to initialize function pointers.
+        (emacs_gnutls_handshake, Fgnutls_error_string, Fgnutls_deinit)
+        (emacs_gnutls_global_init, Fgnutls_bye): Use function pointers.
+        (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
+        Wrappers for gnutls_record_check_pending and gnutls_transport_set_errno.
+        (emacs_gnutls_write, emacs_gnutls_read)
+        (emacs_gnutls_handle_error, Fgnutls_error_fatalp)
+        (Fgnutls_available_p): New function.
+        (Fgnutls_boot): Call Fgnutls_available_p.  Use function pointers.
+        (syms_of_gnutls) <Qgnutls_dll>: Initialize and staticpro it.
+        (syms_of_gnutls) <Sgnutls_available_p>: defsubr it.
+
+        * image.c: Include w32.h.
+        (Vimage_type_cache): Delete.
+        (syms_of_image) <Vimage_type_cache>: Don't initialize and staticpro it.
+        (CACHE_IMAGE_TYPE, Finit_image_library): Use Vlibrary_cache instead.
+        (w32_delayed_load): Move to w32.c.
+
+        * w32.h (VlibraryCache, QCloaded_from, w32_delayed_load): Declare.
+
+        * w32.c (QCloaded_from, Vlibrary_cache): Define.
+        (w32_delayed_load): Move from image.c.  When loading a library, record
+        its filename in the :loaded-from property of the library id.
+        (globals_of_w32) <QCloaded_from, Vlibrary_cache>:
+        Initialize and staticpro them.
+        (emacs_gnutls_pull, emacs_gnutls_push): Call emacs_gnutls_* functions.
+
+        * process.c: Include lisp.h before w32.h, not after.
+        (wait_reading_process_output): Call emacs_gnutls_record_check_pending
+        instead of gnutls_record_check_pending.
+
+        * callproc.c, emacs.c: Include lisp.h before w32.h, not after.
+
 2011-05-04  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnutls.c (Fgnutls_boot): Support :keylist and :crlfiles options