# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1129694144 0
# Node ID 53c764d16ccfe76f38b26b300ff94cd28de8cbf1
# Parent  2e59eea25fcf0b84d4cedb1e37ec8ac0f0f43422
	* display.texi (Showing Images): Document max-image-size.

diff -r 2e59eea25fcf -r 53c764d16ccf lispref/ChangeLog
--- a/lispref/ChangeLog	Wed Oct 19 03:55:20 2005 +0000
+++ b/lispref/ChangeLog	Wed Oct 19 03:55:44 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* display.texi (Showing Images): Document max-image-size.
+
 2005-10-17  Richard M. Stallman  <rms@gnu.org>
 
 	* commands.texi (Quitting): Minor clarification.
diff -r 2e59eea25fcf -r 53c764d16ccf lispref/display.texi
--- a/lispref/display.texi	Wed Oct 19 03:55:20 2005 +0000
+++ b/lispref/display.texi	Wed Oct 19 03:55:44 2005 +0000
@@ -4058,6 +4058,21 @@
 Focus}).
 @end defun
 
+@defvar max-image-size
+@tindex max-image-size
+This variable is used to define the maximum size of image that Emacs
+will load.  If its value is a floating point number, that number is
+multiplied by the width and height of the selected frame, in pixels,
+to give the maximum image width and height.  Emacs will refuse to load
+and display any image that is larger than this.
+
+The purpose of this variable is to prevent unreasonably large images
+from accidentally being loaded into Emacs.  It only takes effect the
+first time an image is loaded.  Once an image is placed in the image
+cache, it can always be displayed, even if the value of
+@var{max-image-size} is subsequently changed (@pxref{Image Cache}).
+@end defvar
+
 @node Image Cache
 @subsection Image Cache