[Emacs-diffs] /srv/bzr/emacs/trunk r101241: Fix previous merge from Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101241
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-31 00:51:08 +0000
message:
  Fix previous merge from Gnus trunk.
modified:
  lisp/gnus/gnus-ems.el
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/gnus-ems.el'
--- a/lisp/gnus/gnus-ems.el     2010-08-30 23:35:19 +0000
+++ b/lisp/gnus/gnus-ems.el     2010-08-31 00:51:08 +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)

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-08-31 00:23:25 +0000
+++ b/lisp/gnus/gnus-html.el    2010-08-31 00:51:08 +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