Make html image insertion probably work for XEmacs, too by Lars Magne Ingebrigtsen <larsi@gnus.org>.

3 files changed, 17 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 79219bc5044..f2af7b2614f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus-html.el (gnus-html-put-image): Use gnus-put-image.
+
+        * gnus-ems.el (gnus-put-image): Have gnus-put-image take an optional
+        point parameter.
+
         * gnus-group.el (gnus-group-completing-read): Add 'substring to
         completion-styles for group selection.
 
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index efa74146a91..b7dc4874f6d 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -274,13 +274,15 @@
       (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)
-  (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))
+(defun gnus-put-image (glyph &optional string category point)
+  (let ((point (or point (point))))
+    (save-excursion
+      (goto-char point)
+      (put-image glyph point)
+      (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 eb35aca505a..9c9908e0693 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -171,11 +171,11 @@
                        (= (car (image-size image t)) 30)
                        (= (cdr (image-size image t)) 30))))
         (progn
-          (put-image image point)
+          (gnus-put-image image nil nil point)
           t)
       (when (fboundp 'find-image)
-        (put-image (find-image '((:type xpm :file "lock-broken.xpm")))
-                   point))
+        (gnus-put-image (find-image '((:type xpm :file "lock-broken.xpm")))
+                        nil nil point))
       nil)))
 
 (defun gnus-html-prune-cache ()