[gnus git] branch master updated: m0-1-138-gaff2b98 =1= Fix merge

       via  aff2b98c7f720ec251c9da1f857ae39d359b90ba (commit)
      from  331faf118601a6693115666283894b37a5ac847f (commit)


- Log -----------------------------------------------------------------
commit aff2b98c7f720ec251c9da1f857ae39d359b90ba
Author: Lars Ingebrigtsen <[email protected]>
Date:   Mon Feb 13 11:40:22 2012 +0100

    Fix merge

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3eee67f..e3bf51c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2012-02-13  Lars Ingebrigtsen  <[email protected]>
 
 	* shr.el (shr-rescale-image): Allow viewing large images.
+	(shr-rescale-image): Fix wrong merge.
 
 2012-02-12  Lars Ingebrigtsen  <[email protected]>
 
diff --git a/lisp/shr.el b/lisp/shr.el
index 9a66dd0..cb7f94f 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -612,7 +612,9 @@ size, and full-buffer size."
 	image)
     (insert alt)))
 
-(defun shr-rescale-image (data)
+(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 0)
 	 (image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))

-----------------------------------------------------------------------
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 |    1 +
 lisp/shr.el    |    4 +++-
 2 files changed, 4 insertions(+), 1 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