2 files changed, 13 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index afc7b6b8249..7c484aeaab0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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 --git a/etc/NEWS b/etc/NEWS
index 3c9044d95d8..327dda297e2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4689,6 +4689,15 @@ explicitly; for example, if an image is put in etc/images/foo/bar.xpm:
 
   (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)