Rename `image-library-alist' to `dynamic-library-alist'.

* etc/NEWS: Mention `dynamic-library-alist'.

* lisp/image.el (image-library-alist): Declare as obsolete alias.
  (image-type-available-p): Use `dynamic-library-alist'.

* lisp/term/w32-win.el (dynamic-library-alist):
  Use instead of `image-library-alist'.

* nt/INSTALL: Refer to `dynamic-library-alist'.

* src/image.c (Vimage_library_alist)
  (syms_of_image) <image-library-alist>: Move to src/emacs.c and rename.
  (lookup_image_type): Use Vdynamic_library_alist.
  (Finit_image_library): Doc fix.

* src/emacs.c (Vdynamic_library_alist)
  (syms_of_emacs) <dynamic-library-alist>: Move from src/image.c and rename.
  Doc fix.

* src/lisp.h (Vdynamic_library_alist): Declare extern.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 766929b42b51ee7a598bef5fb45865919738f80c..037c9eab26659eaae0218390a1960d4876ffb2c1 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * NEWS: Mention `dynamic-library-alist'.
+
 2010-10-13  Glenn Morris  <rgm@gnu.org>
 
        * NEXTSTEP: New file, extracted from ../nextstep/{AUTHORS,README}.

diff --git a/etc/NEWS b/etc/NEWS
index 7ee81f9b81d9d434c2f4e1398a9c206e3713591b..d9d84b9ce19ef1c9abf6ccb2b0e5e3298299303f 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -578,6 +578,11 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 \f
 * Lisp changes in Emacs 24.1
 
+** `image-library-alist' is renamed to `dynamic-library-alist'.
+The variable is now used to load all kind of supported dynamic libraries,
+not just image libraries.  The previous name is still available as an
+obsolete alias.
+
 ** New variable syntax-propertize-function to set syntax-table properties.
 Replaces font-lock-syntactic-keywords which are now obsolete.
 This allows syntax-table properties to be set independently from font-lock:

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39b5f3c0137aa0077caebe73d4d9658d4c8d8a83..190feab75bf07716dc96bf4c8c4aaab14c14fe60 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * image.el (image-library-alist): Declare as obsolete alias.
+       (image-type-available-p): Use `dynamic-library-alist'.
+
+       * term/w32-win.el (dynamic-library-alist):
+       Use instead of `image-library-alist'.
+
 2010-10-13  IRIE Shinsuke  <irieshinsuke@yahoo.co.jp>  (tiny change)
 
        * subr.el (last): Make it faster.  (Bug#7174)

diff --git a/lisp/image.el b/lisp/image.el
index 8dd88f627a11ccf9751d954f024643a84671abbb..0afdc71cb9ed2eb696bedfbd1428c3c15f358fa8 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -330,14 +330,16 @@ Optional DATA-P non-nil means SOURCE is a string containing image data."
   type)
 
 
-(defvar image-library-alist)
+(define-obsolete-variable-alias
+    'image-library-alist
+    'dynamic-library-alist "24.1")
 
 ;;;###autoload
 (defun image-type-available-p (type)
   "Return non-nil if image type TYPE is available.
 Image types are symbols like `xbm' or `jpeg'."
   (and (fboundp 'init-image-library)
-       (init-image-library type image-library-alist)))
+       (init-image-library type dynamic-library-alist)))
 
 
 ;;;###autoload

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 1779d1025e07825e8dbd1d5c570d6e0ae1c71de7..54bb5a5027b0602e8a1ac8e19e93b02d47a9781c 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -196,10 +196,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   "Report an error when a suspend is attempted."
   (error "Suspending an Emacs running under W32 makes no sense"))
 
-(defvar image-library-alist)
+(defvar dynamic-library-alist)
 
-;;; Set default known names for image libraries
-(setq image-library-alist
+;;; Set default known names for external libraries
+(setq dynamic-library-alist
       '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
         (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
         ;; these are libpng 1.2.8 from GTK+

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5f92bedd8c19f3e091932c172945fb2a12a79261..44d937e4db9398b66f0dcf8c473e3e3f0ac6035c 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * INSTALL: Refer to `dynamic-library-alist'.
+
 2010-10-06  Juanma Barranquero  <lekktu@gmail.com>
 
        * INSTALL: Add note about problematic characters passed to configure.

diff --git a/nt/INSTALL b/nt/INSTALL
index c26ab196bd2acd3e2fb2d4436323a5414c6ffcf4..357cc8d0a8ed45ca81dd484447d287f2b90a1671 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -266,7 +266,7 @@
   library is not an error; the associated image format will simply be
   unavailable.  Note that once Emacs has determined that a library can
   not be found, there's no way to force it to try again, other than
-  restarting.  See the variable `image-library-alist' to configure the
+  restarting.  See the variable `dynamic-library-alist' to configure the
   expected names of the libraries.
 
   Some image libraries have dependencies on one another, or on zlib.

diff --git a/src/ChangeLog b/src/ChangeLog
index c44cd507693d044d08e9a53fbd60f3e30b059b30..9100259c978ee2f80c5481c55accac15c2e04784 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs.c (Vdynamic_library_alist)
+       (syms_of_emacs) <dynamic-library-alist>: Move from image.c and rename.
+       Doc fix.
+
+       * lisp.h (Vdynamic_library_alist): Declare extern.
+
+       * image.c (Vimage_library_alist)
+       (syms_of_image) <image-library-alist>: Move to emacs.c and rename.
+       (lookup_image_type): Use Vdynamic_library_alist.
+       (Finit_image_library): Doc fix.
+
 2010-10-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * Makefile.in (lispsource, libsrc, etc, oldxmenudir, lwlibdir)

diff --git a/src/emacs.c b/src/emacs.c
index 95e2f0c0d37ea94eb866399caa12a005f30cf005..70a0fae4ebfc5c59b816380b22de35c956263f65 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -187,6 +187,9 @@ Lisp_Object Vprevious_system_time_locale;
    Lisp code.  */
 Lisp_Object Vemacs_copyright, Vemacs_version;
 
+/* Alist of external libraries and files implementing them.  */
+Lisp_Object Vdynamic_library_alist;
+
 /* If non-zero, emacs should not attempt to use a window-specific code,
    but instead should use the virtual terminal under which it was started.  */
 int inhibit_window_system;
@@ -2507,6 +2510,24 @@ This is nil during initialization.  */);
               doc: /* Version numbers of this version of Emacs.  */);
   Vemacs_version = build_string (emacs_version);
 
+  DEFVAR_LISP ("dynamic-library-alist", &Vdynamic_library_alist,
+    doc: /* Alist of dynamic libraries vs external files implementing them.
+Each element is a list (LIBRARY FILE...), where the 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 on
+the list; if none is loaded, the running session of Emacs won't have access
+to that library.
+
+Note that image types `pbm' and `xbm' do not need entries in this variable
+because they do not depend on external libraries and are always available.
+
+Also note that this is not a generic facility for accessing external
+libraries; only those already known by Emacs will be loaded.  */);
+  Vdynamic_library_alist = Qnil;
+  Fput (intern_c_string ("dynamic-library-alist"), Qrisky_local_variable, Qt);
+
   /* Make sure IS_DAEMON starts up as false.  */
   daemon_pipe[1] = 0;
 }

diff --git a/src/image.c b/src/image.c
index 72cbad987f62f7433f7736e777ddf44d8455a6a3..4b816ce5f9f86a5b2425def01def322ad3a2a0ec 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -567,10 +567,6 @@ static struct image_type *image_types;
 
 Lisp_Object Vimage_types;
 
-/* An alist of image types and libraries that implement the type.  */
-
-Lisp_Object Vimage_library_alist;
-
 /* Cache for delayed-loading image types.  */
 
 static Lisp_Object Vimage_type_cache;
@@ -645,7 +641,7 @@ lookup_image_type (Lisp_Object symbol)
   struct image_type *type;
 
   /* We must initialize the image-type if it hasn't been already.  */
-  if (NILP (Finit_image_library (symbol, Vimage_library_alist)))
+  if (NILP (Finit_image_library (symbol, Vdynamic_library_alist)))
     return 0;                  /* unimplemented */
 
   for (type = image_types; type; type = type->next)
@@ -1923,10 +1919,11 @@ mark_image_cache (struct image_cache *c)
   }
 
 /* Load a DLL implementing an image type.
-   The `image-library-alist' variable associates a symbol,
-   identifying an image type, to a list of possible filenames.
+   The argument LIBRARIES is usually the variable
+   `dynamic-library-alist', which associates a symbol, identifying
+   an external DLL library, to a list of possible filenames.
    The function returns NULL if no library could be loaded for
-   the given image type, or if the library was previously loaded;
+   the given symbol, or if the library was previously loaded;
    else the handle of the DLL.  */
 static HMODULE
 w32_delayed_load (Lisp_Object libraries, Lisp_Object type)
@@ -8583,7 +8580,7 @@ Return non-nil if TYPE is a supported image type.
 
 Image types pbm and xbm are prebuilt; other types are loaded here.
 Libraries to load are specified in alist LIBRARIES (usually, the value
-of `image-library-alist', which see).  */)
+of `dynamic-library-alist', which see).  */)
   (Lisp_Object type, Lisp_Object libraries)
 {
   Lisp_Object tested;
@@ -8659,20 +8656,6 @@ Each element of the list is a symbol for an image type, like 'jpeg or 'png.
 To check whether it is really supported, use `image-type-available-p'.  */);
   Vimage_types = Qnil;
 
-  DEFVAR_LISP ("image-library-alist", &Vimage_library_alist,
-    doc: /* Alist of image types vs external libraries needed to display them.
-
-Each element is a list (IMAGE-TYPE LIBRARY...), where the car is a symbol
-representing a supported image type, and the rest are strings giving
-alternate filenames for the corresponding external libraries.
-
-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.  Types 'pbm and 'xbm don't need to be
-listed; they are always supported.  */);
-  Vimage_library_alist = Qnil;
-  Fput (intern_c_string ("image-library-alist"), Qrisky_local_variable, Qt);
-
   DEFVAR_LISP ("max-image-size", &Vmax_image_size,
     doc: /* Maximum size of images.
 Emacs will not load an image into memory if its pixel width or

diff --git a/src/lisp.h b/src/lisp.h
index a630eeec1f3694b8198ddaa265c731f63f24374f..c9104f889548a719028a0697d13c511fd966a289 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3300,6 +3300,7 @@ extern Lisp_Object Vbefore_init_time, Vafter_init_time;
 extern Lisp_Object Vinstallation_directory;
 extern Lisp_Object empty_unibyte_string, empty_multibyte_string;
 extern Lisp_Object Qfile_name_handler_alist;
+extern Lisp_Object Vdynamic_library_alist;
 extern void (*fatal_error_signal_hook) (void);
 EXFUN (Fkill_emacs, 1) NO_RETURN;
 #if HAVE_SETLOCALE