Mercurial > emacs

changeset 110054:fe1595694e7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous merge from Gnus trunk.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 31 Aug 2010 00:51:08 +0000
parents a0d37c11985b
children 140a469a3964
files lisp/gnus/gnus-ems.el lisp/gnus/gnus-html.el
diffstat 2 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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