diff --git a/src/ChangeLog b/src/ChangeLog
index bc4dd813023..8e598412763 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xterm.c (x_display_ok): Fix minor bug and compilation warnings.
+
 2006-03-18  Nozomu Ando  <nand@mac.com>
 
 	* m/pmax.h (BROKEN_NOCOMBRELOC) [__NetBSD__]: Define.
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)))