From: Stefan Kangas <stefankangas@gmail.com>
Date: Fri, 4 Oct 2019 00:20:28 +0000 (+0200)
Subject: Remove XEmacs compat code from re-builder.el
X-Git-Tag: emacs-27.0.90~1288
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=094e48e4e7d71ca2d26ab047494afaa703ca85eb;p=emacs.git

Remove XEmacs compat code from re-builder.el

* lisp/emacs-lisp/re-builder.el (top-level)
(reb-color-display-p): Remove XEmacs compat code.
---

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 1054f1453bc..f8e264cf393 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -103,10 +103,6 @@
 
 ;;; Code:
 
-;; On XEmacs, load the overlay compatibility library
-(unless (fboundp 'make-overlay)
-  (require 'overlay))
-
 ;; User customizable variables
 (defgroup re-builder nil
   "Options for the RE Builder."
@@ -319,12 +315,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
 
 (defun reb-color-display-p ()
   "Return t if display is capable of displaying colors."
-  (eq 'color
-      ;; emacs/xemacs compatibility
-      (if (fboundp 'frame-parameter)
-	  (frame-parameter nil 'display-type)
-	(if (fboundp 'frame-property)
-	    (frame-property (selected-frame) 'display-type)))))
+  (eq 'color (frame-parameter nil 'display-type)))
 
 (defsubst reb-lisp-syntax-p ()
   "Return non-nil if RE Builder uses a Lisp syntax."