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

This commit is contained in:
Chong Yidong 2006-03-18 15:41:59 +00:00
parent e4d181dcba
commit 11aaf44796
2 changed files with 7 additions and 2 deletions

View file

@ -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.

View file

@ -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)))