From 240e90f562bf9d565f39b1b84d601ceac9b91a7f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 12 Mar 2003 09:59:28 +0000 Subject: [PATCH] Synch to Oort Gnus 200303121020. --- lisp/ChangeLog | 6 ++++++ lisp/mm-view.el | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 531473c..f6baefa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-03-12 Katsumi Yamaoka + + * 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 * 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 --- 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))) -- 1.7.10.4