# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283215868 0
# Node ID fe1595694e7e8ab6cbb88606a2c5e388ab54f36e
# Parent  a0d37c11985b957ca493f66324698e522037422d
Fix previous merge from Gnus trunk.

diff -r a0d37c11985b -r fe1595694e7e lisp/gnus/gnus-ems.el
--- a/lisp/gnus/gnus-ems.el	Tue Aug 31 00:42:27 2010 +0000
+++ b/lisp/gnus/gnus-ems.el	Tue Aug 31 00:51:08 2010 +0000
@@ -274,15 +274,13 @@
       (setq props (plist-put props :background (face-background face))))
     (apply 'create-image file type data-p props)))
 
-(defun gnus-put-image (glyph &optional string category point)
-  (let ((point (or point (point))))
-    (save-excursion
-      (goto-char point)
-      (insert-image glyph (or string " "))
-      (put-text-property point (point) 'gnus-image-category category)
-      (unless string
-	(put-text-property (1- (point)) (point)
-			   'gnus-image-text-deletable t)))
+(defun gnus-put-image (glyph &optional string category)
+  (let ((point (point)))
+    (insert-image glyph (or string " "))
+    (put-text-property point (point) 'gnus-image-category category)
+    (unless string
+      (put-text-property (1- (point)) (point)
+			 'gnus-image-text-deletable t))
     glyph))
 
 (defun gnus-remove-image (image &optional category)
diff -r a0d37c11985b -r fe1595694e7e lisp/gnus/gnus-html.el
--- a/lisp/gnus/gnus-html.el	Tue Aug 31 00:42:27 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Tue Aug 31 00:51:08 2010 +0000
@@ -172,7 +172,8 @@
 	(if (and image
 		 ;; Kludge to avoid displaying 30x30 gif images, which
 		 ;; seems to be a signal of a broken image.
-		 (not (and (eq (getf (cdr image) :type) 'gif)
+		 (not (and (listp image)
+			   (eq (getf (cdr image) :type) 'gif)
 			   (= (car (image-size image t)) 30)
 			   (= (cdr (image-size image t)) 30))))
 	    (progn