diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-13 16:50:06 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-13 16:50:06 +0200 |
| commit | 2e288d54f05ba6e72a227ed3857a8098ca585b50 (patch) | |
| tree | 721182610fc404c5469c5dcf6375b0b95692fad5 /lisp | |
| parent | d0e0de31a6628cd38c69f555aebab0a49ff64418 (diff) | |
| download | emacs-2e288d54f05ba6e72a227ed3857a8098ca585b50.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/image.el | 6 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39b5f3c0137..190feab75bf 100644 --- 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 8dd88f627a1..0afdc71cb9e 100644 --- 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 1779d1025e0..54bb5a5027b 100644 --- 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+ |