diff options
| author | Stefan Kangas | 2019-10-04 02:20:28 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2019-10-04 15:26:10 +0200 |
| commit | 094e48e4e7d71ca2d26ab047494afaa703ca85eb (patch) | |
| tree | 43999e0092c67ac3177c72bf4c8add63c1053aaf | |
| parent | 8ef09cb30a526f34236f6696d06a2848043685ae (diff) | |
| download | emacs-094e48e4e7d71ca2d26ab047494afaa703ca85eb.tar.gz emacs-094e48e4e7d71ca2d26ab047494afaa703ca85eb.zip | |
Remove XEmacs compat code from re-builder.el
* lisp/emacs-lisp/re-builder.el (top-level)
(reb-color-display-p): Remove XEmacs compat code.
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 11 |
1 files changed, 1 insertions, 10 deletions
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 @@ | |||
| 103 | 103 | ||
| 104 | ;;; Code: | 104 | ;;; Code: |
| 105 | 105 | ||
| 106 | ;; On XEmacs, load the overlay compatibility library | ||
| 107 | (unless (fboundp 'make-overlay) | ||
| 108 | (require 'overlay)) | ||
| 109 | |||
| 110 | ;; User customizable variables | 106 | ;; User customizable variables |
| 111 | (defgroup re-builder nil | 107 | (defgroup re-builder nil |
| 112 | "Options for the RE Builder." | 108 | "Options for the RE Builder." |
| @@ -319,12 +315,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.") | |||
| 319 | 315 | ||
| 320 | (defun reb-color-display-p () | 316 | (defun reb-color-display-p () |
| 321 | "Return t if display is capable of displaying colors." | 317 | "Return t if display is capable of displaying colors." |
| 322 | (eq 'color | 318 | (eq 'color (frame-parameter nil 'display-type))) |
| 323 | ;; emacs/xemacs compatibility | ||
| 324 | (if (fboundp 'frame-parameter) | ||
| 325 | (frame-parameter nil 'display-type) | ||
| 326 | (if (fboundp 'frame-property) | ||
| 327 | (frame-property (selected-frame) 'display-type))))) | ||
| 328 | 319 | ||
| 329 | (defsubst reb-lisp-syntax-p () | 320 | (defsubst reb-lisp-syntax-p () |
| 330 | "Return non-nil if RE Builder uses a Lisp syntax." | 321 | "Return non-nil if RE Builder uses a Lisp syntax." |