diff options
| author | Juanma Barranquero | 2010-10-13 16:50:06 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-13 16:50:06 +0200 |
| commit | 2e288d54f05ba6e72a227ed3857a8098ca585b50 (patch) | |
| tree | 721182610fc404c5469c5dcf6375b0b95692fad5 /lisp | |
| parent | d0e0de31a6628cd38c69f555aebab0a49ff64418 (diff) | |
| download | emacs-2e288d54f05ba6e72a227ed3857a8098ca585b50.tar.gz emacs-2e288d54f05ba6e72a227ed3857a8098ca585b50.zip | |
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 @@ | |||
| 1 | 2010-10-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * image.el (image-library-alist): Declare as obsolete alias. | ||
| 4 | (image-type-available-p): Use `dynamic-library-alist'. | ||
| 5 | |||
| 6 | * term/w32-win.el (dynamic-library-alist): | ||
| 7 | Use instead of `image-library-alist'. | ||
| 8 | |||
| 1 | 2010-10-13 IRIE Shinsuke <irieshinsuke@yahoo.co.jp> (tiny change) | 9 | 2010-10-13 IRIE Shinsuke <irieshinsuke@yahoo.co.jp> (tiny change) |
| 2 | 10 | ||
| 3 | * subr.el (last): Make it faster. (Bug#7174) | 11 | * 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." | |||
| 330 | type) | 330 | type) |
| 331 | 331 | ||
| 332 | 332 | ||
| 333 | (defvar image-library-alist) | 333 | (define-obsolete-variable-alias |
| 334 | 'image-library-alist | ||
| 335 | 'dynamic-library-alist "24.1") | ||
| 334 | 336 | ||
| 335 | ;;;###autoload | 337 | ;;;###autoload |
| 336 | (defun image-type-available-p (type) | 338 | (defun image-type-available-p (type) |
| 337 | "Return non-nil if image type TYPE is available. | 339 | "Return non-nil if image type TYPE is available. |
| 338 | Image types are symbols like `xbm' or `jpeg'." | 340 | Image types are symbols like `xbm' or `jpeg'." |
| 339 | (and (fboundp 'init-image-library) | 341 | (and (fboundp 'init-image-library) |
| 340 | (init-image-library type image-library-alist))) | 342 | (init-image-library type dynamic-library-alist))) |
| 341 | 343 | ||
| 342 | 344 | ||
| 343 | ;;;###autoload | 345 | ;;;###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.") | |||
| 196 | "Report an error when a suspend is attempted." | 196 | "Report an error when a suspend is attempted." |
| 197 | (error "Suspending an Emacs running under W32 makes no sense")) | 197 | (error "Suspending an Emacs running under W32 makes no sense")) |
| 198 | 198 | ||
| 199 | (defvar image-library-alist) | 199 | (defvar dynamic-library-alist) |
| 200 | 200 | ||
| 201 | ;;; Set default known names for image libraries | 201 | ;;; Set default known names for external libraries |
| 202 | (setq image-library-alist | 202 | (setq dynamic-library-alist |
| 203 | '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") | 203 | '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") |
| 204 | (png "libpng12d.dll" "libpng12.dll" "libpng.dll" | 204 | (png "libpng12d.dll" "libpng12.dll" "libpng.dll" |
| 205 | ;; these are libpng 1.2.8 from GTK+ | 205 | ;; these are libpng 1.2.8 from GTK+ |