From 11aaf447961692f40760cdc3b262bbf76e341896 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 18 Mar 2006 15:41:59 +0000 Subject: [PATCH] * xterm.c (x_display_ok): Fix minor bug and compilation warnings. --- src/ChangeLog | 4 ++++ src/xterm.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 + + * xterm.c (x_display_ok): Fix minor bug and compilation warnings. + 2006-03-18 Nozomu Ando * 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))) -- 2.39.2