[Emacs-diffs] /srv/bzr/emacs/trunk r101972: Document changes made in revno 101949.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101972
author: Juanma Barranquero <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-15 12:49:07 +0200
message:
  Document changes made in revno 101949.
  
   os.texi (Dynamic Libraries): New node, with slightly modified
   text deleted from "Image Formats".
   (System Interface): Add @menu entry for "Dynamic Libraries".
   display.texi (Image Formats): Remove description of
   image-library-alist.  (Renamed in revno 101949.)
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  doc/lispref/os.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-12 03:52:07 +0000
+++ b/doc/lispref/ChangeLog     2010-10-15 10:49:07 +0000
@@ -1,3 +1,12 @@
+2010-10-15  Eli Zaretskii  <address@hidden>
+
+       * os.texi (Dynamic Libraries): New node, with slightly modified
+       text deleted from "Image Formats".
+       (System Interface): Add @menu entry for "Dynamic Libraries".
+
+       * display.texi (Image Formats): Remove description of
+       image-library-alist.  (Renamed in revno 101949.)
+
 2010-10-12  Glenn Morris  <address@hidden>
 
        * book-spine.texinfo: Rename to book-spine.texi.

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2010-09-09 02:18:38 +0000
+++ b/doc/lispref/display.texi  2010-10-15 10:49:07 +0000
@@ -4055,10 +4055,12 @@
 
   Emacs can display a number of different image formats; some of them
 are supported only if particular support libraries are installed on
-your machine.  In some environments, Emacs can load image
-libraries on demand; if so, the variable @code{image-library-alist}
-can be used to modify the set of known names for these dynamic
-libraries (though it is not possible to add new image formats).
+your machine.  In some environments, Emacs can load support libraries
+on demand; if so, the variable @code{dynamic-library-alist}
+(@pxref{Dynamic Libraries}) can be used to modify the set of known
+names for these dynamic libraries (though it is not possible to add
+new image formats).  Note that image types @code{pbm} and @code{xbm}
+do not depend on external libraries and are always available in Emacs.
 
   The supported image formats include XBM, XPM (this requires the
 libraries @code{libXpm} version 3.4k and @code{libz}), GIF (requiring
@@ -4082,24 +4084,6 @@
 @code{image-type-available-p}.
 @end defvar
 
address@hidden image-library-alist
-This in an alist of image types vs external libraries needed to
-display them.
-
-Each element is a list @code{(@var{image-type} @var{library}...)},
-where the car is a supported image format from @code{image-types}, and
-the rest are strings giving alternate filenames for the corresponding
-external libraries to load.
-
-Emacs tries to load the libraries in the order they appear on the
-list; if none is loaded, the running session of Emacs won't support
-the image type.  @code{pbm} and @code{xbm} don't need to be listed;
-they're always supported.
-
-This variable is ignored if the image libraries are statically linked
-into Emacs.
address@hidden defvar
-
 @defun image-type-available-p type
 This function returns address@hidden if image type @var{type} is
 available, i.e., if images of this type can be loaded and displayed in

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2010-10-02 02:30:11 +0000
+++ b/doc/lispref/os.texi       2010-10-15 10:49:07 +0000
@@ -37,6 +37,7 @@
 * X11 Keysyms::         Operating on key symbols for X Windows.
 * Batch Mode::          Running Emacs without terminal interaction.
 * Session Management::  Saving and restoring state with X Session Management.
+* Dynamic Libraries::   On-demand loading of support libraries.
 @end menu
 
 @node Starting Up
@@ -2186,6 +2187,57 @@
 @end group
 @end example
 
address@hidden Dynamic Libraries
address@hidden Dynamically Loaded Libraries
address@hidden dynamic libraries
+
+  A @dfn{dynamically loaded library} is a library that is loaded on
+demand, when its facilities are first needed.  Emacs supports such
+on-demand loading of support libraries for some of its features.
+
address@hidden dynamic-library-alist
+This is an alist of dynamic libraries and external library files
+implementing them.
+
+Each element is a list of the form
address@hidden@code{(@var{library} @address@hidden)}}, where the @code{car} is
+a symbol representing a supported external library, and the rest are
+strings giving alternate filenames for that library.
+
+Emacs tries to load the library from the files in the order they
+appear in the list; if none is found, the running session of Emacs
+won't have access to that library, and the features that depend on the
+library will be unavailable.
+
+Image support on some platforms uses this facility.  Here's an example
+of setting this variable for supporting images on MS-Windows:
+
address@hidden
+(setq dynamic-library-alist
+      '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
+        (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
+        "libpng13d.dll" "libpng13.dll")
+        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
+        (tiff "libtiff3.dll" "libtiff.dll")
+        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")
+        (svg "librsvg-2-2.dll")
+        (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
+        (glib "libglib-2.0-0.dll")
+       (gobject "libgobject-2.0-0.dll")))
address@hidden lisp
+
+Note that image types @code{pbm} and @code{xbm} do not need entries in
+this variable because they do not depend on external libraries and are
+always available in Emacs.
+
+Also note that this variable is not meant to be a generic facility for
+accessing external libraries; only those already known by Emacs can
+be loaded through it.
+
+This variable is ignored if the given @var{library} is statically
+linked into Emacs.
address@hidden defvar
+
 @ignore
    arch-tag: 8378814a-30d7-467c-9615-74a80b9988a7
 @end ignore