From f60c69b7d30e84d13777ff92754626ee61483e57 Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 16 May 2000 15:58:17 +0000 Subject: [PATCH] * mime-image.el (mime-image-create) [XEmacs]: Don't call `make-image-instance' directly. --- ChangeLog | 5 +++++ mime-image.el | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99e5948..a39a470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-05-16 Daiki Ueno + + * mime-image.el (mime-image-create) [XEmacs]: Don't call + `make-image-instance' directly. + 2000-05-02 Daiki Ueno * pgg-gpg.el (pgg-scheme-encrypt-region): Don't quote recipient; diff --git a/mime-image.el b/mime-image.el index 2110e2c..db2e4b6 100644 --- a/mime-image.el +++ b/mime-image.el @@ -85,16 +85,15 @@ (insert file-or-data) (setq file-or-data (mime-image-normalize-xbm-buffer (current-buffer))))) - (let ((instance - (make-image-instance + (let ((glyph + (make-glyph (if (and type (mime-image-type-available-p type)) (vconcat (list type (if data-p :data :file) file-or-data) props) - file-or-data) - nil nil 'noerror))) - (if (nothing-image-instance-p instance) nil - (make-glyph instance)))) + file-or-data)))) + (if (nothing-image-instance-p (glyph-image-instance glyph)) nil + glyph))) (defun mime-image-insert (image string &optional area) (let ((extent (make-extent (point) (progn (insert string)(point))))) -- 1.7.10.4