[Emacs-diffs] /srv/bzr/emacs/trunk r107290: Increase default image size limit; don't unlimit Gnus.

[Paul Eggert]

------------------------------------------------------------
revno: 107290
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-14 22:40:08 -0800
message:
  Increase default image size limit; don't unlimit Gnus.
  
  * lisp/gnus/shr.el (shr-rescale-image): Undo previous change; see
  <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
  * src/image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see
  <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el
  src/ChangeLog
  src/image.c

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-13 22:18:33 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-15 06:40:08 +0000
@@ -1,3 +1,8 @@
+2012-02-15  Paul Eggert  <address@hidden>
+
+       * shr.el (shr-rescale-image): Undo previous change; see
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
 2012-02-13  Lars Ingebrigtsen  <address@hidden>
 
        * nnimap.el (nnimap-record-commands): New variable.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2012-02-13 11:25:56 +0000
+++ b/lisp/gnus/shr.el  2012-02-15 06:40:08 +0000
@@ -557,8 +557,7 @@
     (insert alt)))
 
 (defun shr-rescale-image (data)
-  (let* ((max-image-size nil)
-        (image (create-image data nil t :ascent 100)))
+  (let ((image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))
            (not (get-buffer-window (current-buffer))))
        image

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-15 04:00:34 +0000
+++ b/src/ChangeLog     2012-02-15 06:40:08 +0000
@@ -1,3 +1,8 @@
+2012-02-15  Paul Eggert  <address@hidden>
+
+       * image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
 2012-02-15  Chong Yidong  <address@hidden>
 
        * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is

=== modified file 'src/image.c'
--- a/src/image.c       2012-02-07 03:46:18 +0000
+++ b/src/image.c       2012-02-15 06:40:08 +0000
@@ -976,7 +976,7 @@
 
 static void free_image (struct frame *f, struct image *img);
 
-#define MAX_IMAGE_SIZE 6.0
+#define MAX_IMAGE_SIZE 10.0
 /* Allocate and return a new image structure for image specification
    SPEC.  SPEC has a hash value of HASH.  */