* dispnew.c (init_display): Check DISPLAY here.

* emacs.c (main): Don't check here.
* xterm.c (x_display_ok): Don't use DISPLAY env var.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 368f9c1a6d3..298b1c2e63d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10123,12 +10123,8 @@ x_display_ok (display)
     int dpy_ok = 1;
     Display *dpy;
 
-    if (!display)
-      display = getenv("DISPLAY");
-    if (!display)
-      return 0;
-
-    if ((dpy = XOpenDisplay (display)))
+    dpy = XOpenDisplay (display);
+    if (dpy)
       XCloseDisplay (dpy);
     else
       dpy_ok = 0;