* mime-image.el (mime-image-insert): Synch with the latest image.el.

(mime-display-image): Don't pass underlying string "x".

diff --git a/ChangeLog b/ChangeLog
index f550d77..e9d4878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-27   Daiki Ueno  <ueno@unixuser.org>
+
+       * mime-image.el (mime-image-insert): Synch with the latest image.el.
+       (mime-display-image): Don't pass underlying string "x".
+
 2000-06-23  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * mime-edit.el (mime-edit-quitting-method):

diff --git a/mime-image.el b/mime-image.el
index db2e4b6..48e1230 100644 (file)
--- a/mime-image.el
+++ b/mime-image.el
@@ -95,7 +95,7 @@
          (if (nothing-image-instance-p (glyph-image-instance glyph)) nil
            glyph)))
 
-      (defun mime-image-insert (image string &optional area)
+      (defun mime-image-insert (image &optional string area)
        (let ((extent (make-extent (point) (progn (insert string)(point)))))
          (set-extent-property extent 'invisible t)
          (set-extent-end-glyph extent image))))
@@ -128,12 +128,12 @@
                                     (bitmap-read-xbm-buffer
                                      (current-buffer))) nil) "\n")
               (error nil)))
-          (defun mime-image-insert (image string &optional area)
+          (defun mime-image-insert (image &optional string area)
             (insert image)))
        (error
        (defalias 'mime-image-read-xbm-buffer
          'mime-image-normalize-xbm-buffer)
-       (defun mime-image-insert (image string &optional area)
+       (defun mime-image-insert (image &optional string area)
          (save-restriction
            (narrow-to-region (point)(point))
            (let ((face (gensym "mii")))
@@ -191,7 +191,7 @@
     (if (null image)
        (message "Invalid glyph!")
       (save-excursion
-       (mime-image-insert image "x")
+       (mime-image-insert image)
        (insert "\n")
        (message "Decoding image... done")))))