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

[Chong Yidong]

Index: emacs/lisp/image.el
diff -c emacs/lisp/image.el:1.50 emacs/lisp/image.el:1.51
*** emacs/lisp/image.el:1.50    Sun Sep 18 14:04:46 2005
--- emacs/lisp/image.el Wed Oct 19 03:55:20 2005
***************
*** 135,141 ****
  Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
  Optional PROPS are additional image attributes to assign to the image,
  like, e.g. `:mask MASK'.
! Value is the image created, or nil if images of type TYPE are not supported."
    (when (and (not data-p) (not (stringp file-or-data)))
      (error "Invalid image file name `%s'" file-or-data))
    (cond ((null data-p)
--- 135,143 ----
  Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
  Optional PROPS are additional image attributes to assign to the image,
  like, e.g. `:mask MASK'.
! Value is the image created, or nil if images of type TYPE are not supported.
! 
! Images should not be larger than specified by `max-image-size'."
    (when (and (not data-p) (not (stringp file-or-data)))
      (error "Invalid image file name `%s'" file-or-data))
    (cond ((null data-p)
***************
*** 317,323 ****
  specification to be returned.  Return nil if no specification is
  satisfied.
  
! The image is looked for in `image-load-path'."
    (let (image)
      (while (and specs (null image))
        (let* ((spec (car specs))
--- 319,327 ----
  specification to be returned.  Return nil if no specification is
  satisfied.
  
! The image is looked for in `image-load-path'.
! 
! Image files should not be larger than specified by `max-image-size'."
    (let (image)
      (while (and specs (null image))
        (let* ((spec (car specs))