[Emacs-diffs] Changes to emacs/lisp/image.el

[Juanma Barranquero]

Index: emacs/lisp/image.el
diff -c emacs/lisp/image.el:1.40 emacs/lisp/image.el:1.41
*** emacs/lisp/image.el:1.40    Mon Apr 26 22:11:36 2004
--- emacs/lisp/image.el Mon Jun 14 20:58:36 2004
***************
*** 1,6 ****
  ;;; image.el --- image API
  
! ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: multimedia
--- 1,6 ----
  ;;; image.el --- image API
  
! ;; Copyright (C) 1998, 99, 2000, 01, 04 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: multimedia
***************
*** 48,53 ****
--- 48,64 ----
  with one argument, a string containing the image data.  If PREDICATE returns
  a non-nil value, TYPE is the image's type.")
  
+ ;;;###autoload
+ (defvar image-library-alist nil
+   "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 to load.
+ They are tried in the order they appear on the list; if none of them can
+ be loaded, the running session of Emacs won't display the image type.
+ No entries are needed for pbm and xbm images; they're always supported.")
+ ;;;###autoload (put 'image-library-alist 'risky-local-variable t)
  
  (defun image-jpeg-p (data)
    "Value is non-nil if DATA, a string, consists of JFIF image data.
***************
*** 111,118 ****
  (defun image-type-available-p (type)
    "Value is non-nil if image type TYPE is available.
  Image types are symbols like `xbm' or `jpeg'."
!   (and (boundp 'image-types) (not (null (memq type image-types)))))
! 
  
  ;;;###autoload
  (defun create-image (file-or-data &optional type data-p &rest props)
--- 122,129 ----
  (defun image-type-available-p (type)
    "Value is 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)))
  
  ;;;###autoload
  (defun create-image (file-or-data &optional type data-p &rest props)