From 0668f9c04db5ac6b8840877a8bfa1331547929dc Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Fri, 2 Feb 2018 19:14:11 -0500
Subject: [PATCH] Display -> AbstractDisplay (#482)

---
 README.md        | 1 +
 src/Compat.jl    | 6 ++++++
 test/runtests.jl | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 634883f79220a..15265e33dd433 100644
--- a/README.md
+++ b/README.md
@@ -258,6 +258,7 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 ## Renaming
 
+* `Display` is now `AbstractDisplay` ([#24831]).
 
 * `$` is now `xor` or `⊻` ([#18977])
 
diff --git a/src/Compat.jl b/src/Compat.jl
index 18ba3096b2b77..4d31c60861a68 100644
--- a/src/Compat.jl
+++ b/src/Compat.jl
@@ -1491,6 +1491,12 @@ else
     import Distributed
 end
 
+# 0.7.0-DEV.2695
+@static if !isdefined(Base, :AbstractDisplay)
+    const AbstractDisplay = Display
+    export AbstractDisplay
+end
+
 # 0.7.0-DEV.3583
 @static if !isdefined(Base, :lastindex)
     const lastindex = endof
diff --git a/test/runtests.jl b/test/runtests.jl
index c2f5e54d5f554..8bbfb6749f638 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1293,6 +1293,8 @@ end
 @test !GC.enable(true)
 @test GC.enable(true)
 
+@test eltype(Base.Multimedia.displays) <: AbstractDisplay
+
 # 0.7.0-DEV.3583
 @test lastindex(zeros(4)) == 4
 @test lastindex(zeros(4,4)) == 16