* image.el (create-image, find-image): Mention max-image-size in

	docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da7c176525535984c0012c3e11602c37e35bb039..9c155a9084bcf32a56b206c9b65fc16f985b6451 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/image.el b/lisp/image.el
index ee188677517184340964715969eb660c9d03fbfa..f833cc7e18f2b56f6b491b6e1740cff3cfaee43b 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -135,7 +135,9 @@ use its file extension as image type.
 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 @@ is supported, and FILE exists, is used to construct the image
 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))