Mercurial > emacs
comparison src/xterm.c @ 69607:761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
* emacs.c (main): Don't check here.
* xterm.c (x_display_ok): Don't use DISPLAY env var.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Mon, 20 Mar 2006 22:41:23 +0000 |
parents | f57904524ef9 |
children | a80a437040ab |
comparison
equal
deleted
inserted
replaced
69606:40a0e06dc5aa | 69607:761eaec1aae4 |
---|---|
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 | 10125 |
10126 if (!display) | 10126 dpy = XOpenDisplay (display); |
10127 display = getenv("DISPLAY"); | 10127 if (dpy) |
10128 if (!display) | |
10129 return 0; | |
10130 | |
10131 if ((dpy = XOpenDisplay (display))) | |
10132 XCloseDisplay (dpy); | 10128 XCloseDisplay (dpy); |
10133 else | 10129 else |
10134 dpy_ok = 0; | 10130 dpy_ok = 0; |
10135 return dpy_ok; | 10131 return dpy_ok; |
10136 } | 10132 } |