[Emacs-diffs] /srv/bzr/emacs/trunk r101227: Make html image insertion probably work for XEmacs, too by Lars Magne Ingebrigtsen <address@hidden>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101227
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 23:29:56 +0000
message:
  Make html image insertion probably work for XEmacs, too by Lars Magne 
Ingebrigtsen <address@hidden>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-ems.el
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-08-30 23:24:56 +0000
+++ b/lisp/gnus/ChangeLog       2010-08-30 23:29:56 +0000
@@ -1,5 +1,10 @@
 2010-08-30  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/gnus/gnus-ems.el'
--- a/lisp/gnus/gnus-ems.el     2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/gnus-ems.el     2010-08-30 23:29:56 +0000
@@ -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)

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-08-30 06:17:45 +0000
+++ b/lisp/gnus/gnus-html.el    2010-08-30 23:29:56 +0000
@@ -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 ()