X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-icon.el;h=82ce4e6c2758b2737c6a672ce0c9ae44b065be70;hb=f88a663c1b379044573897f6f2ae44e5f5172ed6;hp=0e067f9b1e6862fdf15c0d0c181f02c0d96c0975;hpb=fd2f4576f383044390c4523947aaead409d34c1a;p=riece

diff --git a/lisp/riece-icon.el b/lisp/riece-icon.el
index 0e067f9..82ce4e6 100644
--- a/lisp/riece-icon.el
+++ b/lisp/riece-icon.el
@@ -182,7 +182,8 @@ static char * a_xpm[] = {
 (defun riece-icon-available-p ()
   (if (featurep 'xemacs)
       (featurep 'xpm)
-    (image-type-available-p 'xpm)))
+    (if (fboundp 'image-type-available-p)
+	(image-type-available-p 'xpm))))
 
 (eval-and-compile
   (if (featurep 'xemacs)
@@ -203,6 +204,12 @@ static char * a_xpm[] = {
 (eval-and-compile
   (if (featurep 'xemacs)
       (defun riece-icon-add-image-region (image start end)
+	(map-extents
+	 (lambda (extent ignore)
+	   (if (or (extent-property extent 'riece-icon-user-list-extent)
+		   (extent-property extent 'riece-icon-user-list-annotation))
+	       (delete-extent extent)))
+	 (current-buffer) start end)
 	(let ((extent (make-extent start end))
 	      (annotation (make-annotation image end 'text)))
 	  (set-extent-property extent 'end-open t)
@@ -212,7 +219,7 @@ static char * a_xpm[] = {
 	  (set-extent-property annotation
 			       'riece-icon-user-list-extent extent)
 	  (set-extent-property extent
-			       'riece-icon-user-list-extent annotation)))
+			       'riece-icon-user-list-annotation annotation)))
     (defun riece-icon-add-image-region (image start end)
       (let ((inhibit-read-only t)
 	    buffer-read-only)