summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-02-14 22:40:08 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-02-14 22:40:08 -0800
commit1127311509efca0c5ba00c583c98e09dddd63dd8 (patch)
treefa4549ede4caaf563ff91025f4aba3cbb0406632 /src
parent34706efab43c7e031d660438f05d6d775fd546a8 (diff)
downloademacs-1127311509efca0c5ba00c583c98e09dddd63dd8.tar.gz
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>.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/image.c2
2 files changed, 6 insertions, 1 deletions
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. */