Synch to Oort Gnus 200303130159.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9c6ea1..6568610 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-view.el (mm-inline-image-emacs): Open the bottom of an image
+       one line.  Suggested by Greg Klanderman <gak@klanderman.net>.
+       (mm-inline-image-xemacs): Ditto.
+
 2003-03-12  Paul Jarc  <prj@po.cwru.edu>
 
        * nnmaildir.el (nnmaildir--parse-filename, nnmaildir--sort-files,

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