[Emacs-diffs] master 094e48e: Remove XEmacs compat code from re-builder.el

[Stefan Kangas]

branch: master
commit 094e48e4e7d71ca2d26ab047494afaa703ca85eb
Author: Stefan Kangas <address@hidden>
Commit: Stefan Kangas <address@hidden>

    Remove XEmacs compat code from re-builder.el
    
    * lisp/emacs-lisp/re-builder.el (top-level)
    (reb-color-display-p): Remove XEmacs compat code.
---
 lisp/emacs-lisp/re-builder.el | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 1054f14..f8e264c 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."