Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 20:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(x_term_init): Give error if can't open DISPLAY_NAME.

Browse source
This commit is contained in:
Richard M. Stallman 2007-09-10 17:34:24 +00:00
parent ebd3fa6bc8
commit 5632bd0fc4
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2007-09-10 Richard Stallman <rms@gnu.org>
* xterm.c (x_term_init): Give error if can't open DISPLAY_NAME.
2007-09-10 Micha,Ak(Bl Cadilhac <michael@cadilhac.name>
* lisp.h (struct Lisp_Subr): Rename `prompt' field to `intspec'.

12
src/xterm.c
View file

@ -10586,9 +10586,12 @@ get_bits_and_offset (mask, bits, offset)
*bits = nr;
}
/* Return 1 if display DISPLAY is available for use, 0 otherwise.
But don't permanently open it, just test its availability. */
int
x_display_ok (display)
const char * display;
const char *display;
{
int dpy_ok = 1;
Display *dpy;
@ -10601,6 +10604,10 @@ x_display_ok (display)
return dpy_ok;
}
/* Open a connection to X display DISPLAY_NAME, and return
the structure that describes the open display.
If we cannot contact the display, return null. */
struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
Lisp_Object display_name;
@ -10621,6 +10628,9 @@ x_term_init (display_name, xrm_option, resource_name)
++x_initialized;
}
if (! x_display_ok (SDATA (display_name)))
error ("Display %s can't be opened", SDATA (display_name));
#ifdef USE_GTK
{
#define NUM_ARGV 10