[Emacs-diffs] /srv/bzr/emacs/trunk r101228: Use insert-image instead of put-image when putting images into a buffer; This makes all the Gnus image-inserting functions work, I think; by Lars Magne Ingebrigtsen <address@hidden>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101228
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 23:35:19 +0000
message:
  Use insert-image instead of put-image when putting images into a buffer; This 
makes all the Gnus image-inserting functions work, I think; by Lars Magne 
Ingebrigtsen <address@hidden>.
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:29:56 +0000
+++ b/lisp/gnus/gnus-ems.el     2010-08-30 23:35:19 +0000
@@ -278,7 +278,7 @@
   (let ((point (or point (point))))
     (save-excursion
       (goto-char point)
-      (put-image glyph point)
+      (insert-image glyph (or string " "))
       (put-text-property point (point) 'gnus-image-category category)
       (unless string
        (put-text-property (1- (point)) (point)

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-08-30 23:29:56 +0000
+++ b/lisp/gnus/gnus-html.el    2010-08-30 23:35:19 +0000
@@ -157,7 +157,7 @@
          (set-buffer buffer)
          (let ((buffer-read-only nil))
            (when (gnus-html-put-image file (cadr spec))
-             (delete-region (cadr spec) (caddr spec))))))
+             (delete-region (1+ (cadr spec)) (caddr spec))))))
       (when images
        (gnus-html-schedule-image-fetching buffer images)))))