From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 31 Aug 2010 00:51:08 +0000 (+0000)
Subject: Fix previous merge from Gnus trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c32d7821250d2543ca16ba96b4b15ea30bb381c;p=emacs.git

Fix previous merge from Gnus trunk.
---

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index ab9782ab36c..efa74146a91 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -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 --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index ba1420fb8ac..e82fee839d0 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -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