[gnus git] branch master updated: m0-3-5-gd8826e2 =1= shr.el (shr-rescale-image): Undo previous change; see <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via d8826e2643d952363c0ade265f832b579fd1b782 (commit)
from 0b5a28f379a3e13feb1ecab6c1bd94c0d2e37f22 (commit)
- Log -----------------------------------------------------------------
commit d8826e2643d952363c0ade265f832b579fd1b782
Author: Paul Eggert <[email protected]>
Date: Wed Feb 15 09:32:33 2012 +0000
shr.el (shr-rescale-image): Undo previous change; see <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fa8734..610eb96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,11 @@
* gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
Gnus 0.3.
+2012-02-15 Paul Eggert <[email protected]>
+
+ * shr.el (shr-rescale-image): Undo previous change; see
+ <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
2012-02-15 Lars Magne Ingebrigtsen <[email protected]>
* gnus.el: Ma Gnus v0.3 is released.
diff --git a/lisp/shr.el b/lisp/shr.el
index 1983c03..35c7c44 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -615,8 +615,7 @@ size, and full-buffer size."
(defun shr-rescale-image (data &optional force)
"Rescale DATA, if too big, to fit the current buffer.
If FORCE, rescale the image anyway."
- (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
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 5 +++++
lisp/shr.el | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project