mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Increase default image size limit; don't unlimit Gnus.

Browse source 
* 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>.
This commit is contained in:
Paul Eggert 2012-02-14 22:40:08 -08:00
parent 34706efab4
commit 1127311509
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View file

@ -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> 2012-02-13 Lars Ingebrigtsen <larsi@gnus.org>
* nnimap.el (nnimap-record-commands): New variable. * nnimap.el (nnimap-record-commands): New variable.

3
lisp/gnus/shr.el
View file

@ -557,8 +557,7 @@ the URL of the image to the kill buffer instead."
(insert alt))) (insert alt)))
(defun shr-rescale-image (data) (defun shr-rescale-image (data)
(let* ((max-image-size nil) (let ((image (create-image data nil t :ascent 100)))
(image (create-image data nil t :ascent 100)))
(if (or (not (fboundp 'imagemagick-types)) (if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer)))) (not (get-buffer-window (current-buffer))))
image image

5
src/ChangeLog
View file

@ -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> 2012-02-15 Chong Yidong <cyd@gnu.org>
* eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is * eval.c (Fdefvar, Fdefconst): Doc fix; note that the variable is

2
src/image.c
View file

@ -976,7 +976,7 @@ or omitted means use the selected frame. */)
static void free_image (struct frame *f, struct image *img); 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 /* Allocate and return a new image structure for image specification
SPEC. SPEC has a hash value of HASH. */ SPEC. SPEC has a hash value of HASH. */