diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 99554cd9ffe..59796c9df4f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-02-15 Paul Eggert <eggert@cs.ucla.edu> + + * 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 <larsi@gnus.org> * nnimap.el (nnimap-record-commands): New variable. diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 47622f5183d..a8bbc77a4b1 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -557,8 +557,7 @@ the URL of the image to the kill buffer instead." (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 diff --git a/src/ChangeLog b/src/ChangeLog index 4375ffef3d7..12b4fa97c33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-02-15 Paul Eggert <eggert@cs.ucla.edu> + + * 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 <cyd@gnu.org> * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is diff --git a/src/image.c b/src/image.c index b2951dd70fb..73490fe2865 100644 --- a/src/image.c +++ b/src/image.c @@ -976,7 +976,7 @@ or omitted means use the selected frame. */) 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. */ |