# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1129694169 0
# Node ID 34cdb895f63b41bdf1a8a5402c38968b316bc13f
# Parent  53c764d16ccfe76f38b26b300ff94cd28de8cbf1
	* NEWS: New variable `max-image-size'.

diff -r 53c764d16ccf -r 34cdb895f63b etc/ChangeLog
--- a/etc/ChangeLog	Wed Oct 19 03:55:44 2005 +0000
+++ b/etc/ChangeLog	Wed Oct 19 03:56:09 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* NEWS: New variable `max-image-size'.
+
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
 	Moved all remaining images from lisp/toolbar to etc/images. The
diff -r 53c764d16ccf -r 34cdb895f63b etc/NEWS
--- a/etc/NEWS	Wed Oct 19 03:55:44 2005 +0000
+++ b/etc/NEWS	Wed Oct 19 03:56:09 2005 +0000
@@ -4689,6 +4689,15 @@
 
   (defimage foo-image '((:type xpm :file "foo/bar.xpm")))
 
++++
+*** The new variable `max-image-size' defines the maximum size of an
+image, relative to the selected frame, that Emacs will load.
+
+This is a floating point number that is multiplied by the width and
+height of the selected frame (in pixels), to give the maximum image
+width and height.  Emacs will not load an image into memory if it is
+larger than this.
+
 ** Mouse pointer features:
 
 +++ (lispref)