# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1129694120 0
# Node ID 2e59eea25fcf0b84d4cedb1e37ec8ac0f0f43422
# Parent  ad1acaef1abbdbe69f57e9688f805b10f9646ff1
	* image.el (create-image, find-image): Mention max-image-size in
	docstring.

diff -r ad1acaef1abb -r 2e59eea25fcf lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 19 03:54:56 2005 +0000
+++ b/lisp/ChangeLog	Wed Oct 19 03:55:20 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* image.el (create-image, find-image): Mention max-image-size in
+	docstring.
+
 2005-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/conf-mode.el: Don't use font-lock-defaults-alist.
diff -r ad1acaef1abb -r 2e59eea25fcf lisp/image.el
--- a/lisp/image.el	Wed Oct 19 03:54:56 2005 +0000
+++ b/lisp/image.el	Wed Oct 19 03:55:20 2005 +0000
@@ -135,7 +135,9 @@
 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."
+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,7 +319,9 @@
 specification to be returned.  Return nil if no specification is
 satisfied.
 
-The image is looked for in `image-load-path'."
+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))