*** empty log message ***

4 files changed, 42 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ca4b17ad824..0bef10b88f5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,6 +16,11 @@ so we will look at it and add it to the manual.
 
 * Installation Changes in Emacs 21.4
 
+** Emacs includes now support for loading image libraries on demand.
+(Currently this feature is only used on MS Windows.)  You can configure
+the supported image types and their associated dynamic libraries by
+setting the variable `image-library-alist'.
+
 ---
 ** A Bulgarian translation of the Emacs Tutorial is available.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ab0e958def..4ac29e4ddfc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -39,7 +39,7 @@
         * files.el (before-save-hook): Add `time-stamp' to the options.
 
         * time-stamp.el (time-stamp): Recommend adding it to
-        `before-save-hook', rather than `write-file-functions'
+        `before-save-hook', rather than `write-file-functions'.
         Make a similar change in `Commentary' section.
 
 2004-06-13  Kai Grossjohann  <kai.grossjohann@gmx.net>
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 51d5997f3f3..c4c6b81e8ba 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-14  Juanma Barranquero  <lektu@terra.es>
+
+        * display.texi (Images): Document new delayed library loading,
+        variable `image-library-alist' and (existing but undocumented)
+        function `image-type-available-p'.
+
 2004-06-05  Richard M. Stallman  <rms@gnu.org>
 
         * minibuf.texi (Minibuffer Completion): For INITIAL arg,
@@ -41,7 +47,7 @@
         * lists.texi (Cons Cells): Explain dotted lists, true lists,
         circular lists.
         (List Elements): Explain handling of circular and dotted lists.
-        
+
 2004-05-19  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * modes.texi (Search-based Fontification): Fix typo.
diff --git a/src/ChangeLog b/src/ChangeLog
index 33a82ca9056..15ee5ed4585 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,31 @@
+2004-06-14  Juanma Barranquero  <lektu@terra.es>
+
+        * dispextern.h (Vimage_types): Make it conditional on
+        HAVE_WINDOW_SYSTEM.
+
+        * image.c (Vimage_types): Move from xdisp.c.
+        (Vimage_type_cache): New variable.
+        (define_image_type): New argument indicating whether an image
+        library was loaded; cache loaded status and return t on success,
+        nil otherwise.
+        (CACHE_IMAGE_TYPE, ADD_IMAGE_TYPE): New macros.
+        (w32_delayed_load): New function to load an image library from a
+        list of possible filenames.
+        (init_xpm_functions, init_png_functions, init_jpeg_functions)
+        (init_tiff_functions, init_gif_functions): Use `w32_delayed_load'.
+        (CHECK_LIB_AVAILABLE): Call `define_image_library' with new
+        argument.
+        (Finit_image_library): New function, extracted from `init_image'.
+        Try to initialize an image library on demand and cache whether we
+        were successful or not.
+        (syms_of_image): Initialize `Vimage_types' and
+        `Vimage_type_cache'.  Add recognized image types to Vimage_types.
+        Export `init-image-library'.
+        (init_image): Remove initialization of all image types, except xbm
+        and pbm.
+
+        * xdisp.c (Vimage_types): Delete (moved to image.c).
+
 2004-06-14  Andreas Schwab  <schwab@suse.de>
 
         * minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
@@ -8,7 +36,7 @@
         * regex.h (CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
         (re_wctype, re_iswctype, re_wctype_to_bit):
         Non-function definitions moved here from regex.c.
-        
+
         * regex.c (re_wctype, re_iswctype): Function defs longer static.
         (CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
         (re_wctype, re_iswctype, re_wctype_to_bit):