* xterm.c (x_display_ok): Fix minor bug and compilation warnings.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 6360b9d2d07..5a22aaf0d31 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10122,9 +10122,10 @@ x_display_ok (display)
 {
     int dpy_ok = 1;
     Display *dpy;
-    char *display_name = display || getenv("DISPLAY");
 
-    if (!display_name)
+    if (!display)
+      display = getenv("DISPLAY");
+    if (!display)
       return 0;
 
     if ((dpy = XOpenDisplay (display)))