* NEWS: New variable `max-image-size'.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index afc7b6b824923843642222a812ee8ed030e0945b..7c484aeaab03ec59b2c8069a246b6049b7f283aa 100644 (file)
--- 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 3c9044d95d84dc28aeb2395586992fdc870c265e..327dda297e2029178d8717321335b20abf6946cc 100644 (file)
--- 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)