summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/gnus-ems.el16
-rw-r--r--lisp/gnus/gnus-html.el3
2 files changed, 9 insertions, 10 deletions
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