Synch to Oort Gnus 200303121020.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 531473c..f6baefa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-view.el (mm-inline-image-emacs): Make it delete an excessive
+       newline next time.
+       (mm-inline-image-xemacs): Ditto.
+
 2003-03-10  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-agent.el (gnus-agent-synchronize-flags-server): Don't use

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index cb1dd37..a38cefe 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -77,21 +77,24 @@
     (put-image (mm-get-image handle) b)
     (mm-handle-set-undisplayer
      handle
-     `(lambda () (remove-images ,b (1+ ,b))))))
+     `(lambda ()
+       (let ((b ,b)
+             buffer-read-only)
+         (remove-images b (1+ b))
+         (delete-region b (1+ b)))))))
 
 (defun mm-inline-image-xemacs (handle)
   (insert "\n")
   (forward-char -1)
-  (let ((b (point))
-       (annot (make-annotation (mm-get-image handle) nil 'text))
+  (let ((annot (make-annotation (mm-get-image handle) nil 'text))
        buffer-read-only)
     (mm-handle-set-undisplayer
      handle
      `(lambda ()
-       (let (buffer-read-only)
+       (let ((b ,(point-marker))
+             buffer-read-only)
          (delete-annotation ,annot)
-         (delete-region ,(set-marker (make-marker) b)
-                        ,(set-marker (make-marker) (point))))))
+         (delete-region (1- b) b))))
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))