From: ueno <ueno>
Date: Wed, 28 Jun 2000 00:26:34 +0000 (+0000)
Subject: * mime-image.el (mime-image-insert): Synch with the latest image.el.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48273ef4f64d947e1e2e7fd717e521cdc10f8439;p=elisp%2Fsemi.git

* 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 fd4c5ce..0faf3cd 100644
--- 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-09   Daiki Ueno  <ueno@unixuser.org>
 
 	* mime-edit.el (mime-edit-insert-key): Insert a text tag when
diff --git a/mime-image.el b/mime-image.el
index db2e4b6..48e1230 100644
--- 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")))))