[Emacs-diffs] master 33dc410 1/3: Remove more XEmacs compat code from ezimage.el

[Lars Ingebrigtsen]

branch: master
commit 33dc41043820c3c28e65ffe0010c047d3b9b0e78
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove more XEmacs compat code from ezimage.el
    
    * lisp/ezimage.el (ezimage-use-images)
    (ezimage-insert-over-text): Remove XEmacs compat code.
---
 lisp/ezimage.el | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 6c590f1..f2b62b2 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)