diff options
| author | Chong Yidong | 2012-09-23 17:16:57 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-09-23 17:16:57 +0800 |
| commit | d07ff9db920196077333148f6db88525c8ba3151 (patch) | |
| tree | 728ab8cebaa9efbfaa79b6076374435727d47db2 /lisp | |
| parent | 4d7e6e51dd4acecff466a28d958c50f34fc130b8 (diff) | |
| download | emacs-d07ff9db920196077333148f6db88525c8ba3151.tar.gz emacs-d07ff9db920196077333148f6db88525c8ba3151.zip | |
Remove LIBRARIES arg from w32_delayed_load and friends.
These always use Vdynamic_library_alist anyway.
* src/image.c (Finit_image_library, lookup_image_type)
(define_image_type): Remove now-unneeded second arg.
(init_xpm_functions, init_png_functions, init_jpeg_functions)
(init_tiff_functions, init_gif_functions, init_svg_functions):
Arglist and w32_delayed_load calling convention changed.
(gs_type): Remove init_gs_functions; there is no such function.
* src/gnutls.c (init_gnutls_functions): Caller changed; remove arg.
(Fgnutls_available_p): Caller changed.
* src/xml.c (init_libxml2_functions, Flibxml_parse_html_region)
(Flibxml_parse_xml_region): Likewise.
* src/dispextern.h (struct image_type): Remove arg from init function.
* src/w32.c (w32_delayed_load): Remove LIBRARIES argument; always use
Vdynamic_library_alist.
* lisp/image.el (image-type-available-p): Change caller to
init-image-library.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/image.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 351b6ea6cb8..d0c1c50a6dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-23 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * image.el (image-type-available-p): Adapt to init-image-library | ||
| 4 | argument changes. | ||
| 5 | |||
| 1 | 2012-09-22 Juri Linkov <juri@jurta.org> | 6 | 2012-09-22 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * dired.el (dired-mode-map): Add [remap read-only-mode] for | 8 | * dired.el (dired-mode-map): Add [remap read-only-mode] for |
diff --git a/lisp/image.el b/lisp/image.el index 99c0a74a512..72dc654757a 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -346,7 +346,7 @@ Optional DATA-P non-nil means SOURCE is a string containing image data." | |||
| 346 | "Return non-nil if image type TYPE is available. | 346 | "Return non-nil if image type TYPE is available. |
| 347 | Image types are symbols like `xbm' or `jpeg'." | 347 | Image types are symbols like `xbm' or `jpeg'." |
| 348 | (and (fboundp 'init-image-library) | 348 | (and (fboundp 'init-image-library) |
| 349 | (init-image-library type dynamic-library-alist))) | 349 | (init-image-library type))) |
| 350 | 350 | ||
| 351 | 351 | ||
| 352 | ;;;###autoload | 352 | ;;;###autoload |