Mercurial > emacs

comparison src/xterm.c @ 69566:1ea752831737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xterm.c (x_display_ok): Fix minor bug and compilation warnings.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 18 Mar 2006 15:41:59 +0000
parents cd511b21f729
children f57904524ef9 e3bacb89536a
comparison
equal deleted inserted replaced
69565:0ab713e3e812 69566:1ea752831737
10120 x_display_ok (display) 10120 x_display_ok (display)
10121 const char * display; 10121 const char * display;
10122 { 10122 {
10123 int dpy_ok = 1; 10123 int dpy_ok = 1;
10124 Display *dpy; 10124 Display *dpy;
10125 char *display_name = display || getenv("DISPLAY"); 10125
10126 10126 if (!display)
10127 if (!display_name) 10127 display = getenv("DISPLAY");
10128 if (!display)
10128 return 0; 10129 return 0;
10129 10130
10130 if ((dpy = XOpenDisplay (display))) 10131 if ((dpy = XOpenDisplay (display)))
10131 XCloseDisplay (dpy); 10132 XCloseDisplay (dpy);
10132 else 10133 else