From 8646a62e20230db0bc05c7b610e5c1ac66a62c24 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 19 Oct 2005 03:55:20 +0000 Subject: [PATCH] * image.el (create-image, find-image): Mention max-image-size in docstring. --- lisp/ChangeLog | 5 +++++ lisp/image.el | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da7c1765255..9c155a9084b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-18 Chong Yidong + + * image.el (create-image, find-image): Mention max-image-size in + docstring. + 2005-10-18 Stefan Monnier * textmodes/conf-mode.el: Don't use font-lock-defaults-alist. diff --git a/lisp/image.el b/lisp/image.el index ee188677517..f833cc7e18f 100644 --- 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)) -- 2.39.5