From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 5 Oct 2019 14:54:57 +0000 (+0200)
Subject: Remove more XEmacs compat code from ezimage.el
X-Git-Tag: emacs-27.0.90~1265
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33dc41043820c3c28e65ffe0010c047d3b9b0e78;p=emacs.git

Remove more XEmacs compat code from ezimage.el

* lisp/ezimage.el (ezimage-use-images)
(ezimage-insert-over-text): Remove XEmacs compat code.
---

diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 6c590f16ac8..f2b62b27fa9 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -37,11 +37,8 @@
   (error nil))
 
 ;;; Code:
-(defcustom ezimage-use-images (if (featurep 'xemacs)
-				  (and (fboundp 'make-image-specifier)
-				       window-system)
-				(and (display-images-p)
-				     (image-type-available-p 'xpm)))
+(defcustom ezimage-use-images (and (display-images-p)
+                                   (image-type-available-p 'xpm))
   "Non-nil means ezimage should display icons."
   :group 'ezimage
   :version "21.1"
@@ -216,13 +213,8 @@ Assumes the image is part of a GUI and can be clicked on.
 Optional argument STRING is a string upon which to add text properties."
   (when ezimage-use-images
     (add-text-properties start end
-			 (if (featurep 'xemacs)
-			     (list 'end-glyph image
-				   'rear-nonsticky (list 'display)
-				   'invisible t
-				   'detachable t)
-			   (list 'display image
-				 'rear-nonsticky (list 'display)))
+			 (list 'display image
+			       'rear-nonsticky (list 'display))
 			 string))
   string)