Mercurial > hg > xemacs-beta
comparison src/device-x.c @ 74:54cc21c15cbb r20-0b32
Import from CVS: tag r20-0b32
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:04:33 +0200 |
parents | 131b0175ea99 |
children | 8619ce7e4c50 |
comparison
equal
deleted
inserted
replaced
73:e2d7a37b7c8d | 74:54cc21c15cbb |
---|---|
222 XSETDEVICE (device, d); | 222 XSETDEVICE (device, d); |
223 display = DEVICE_CONNECTION (d); | 223 display = DEVICE_CONNECTION (d); |
224 | 224 |
225 allocate_x_device_struct (d); | 225 allocate_x_device_struct (d); |
226 | 226 |
227 if (NILP (Vdefault_x_device)) | |
228 Vdefault_x_device = device; | |
229 | |
230 make_argc_argv (Vx_initial_argv_list, &argc, &argv); | 227 make_argc_argv (Vx_initial_argv_list, &argc, &argv); |
231 | 228 |
232 if (STRINGP (Vx_emacs_application_class) && | 229 if (STRINGP (Vx_emacs_application_class) && |
233 XSTRING_LENGTH (Vx_emacs_application_class) > 0) | 230 XSTRING_LENGTH (Vx_emacs_application_class) > 0) |
234 GET_C_STRING_CTEXT_DATA_ALLOCA (Vx_emacs_application_class, app_class); | 231 GET_C_STRING_CTEXT_DATA_ALLOCA (Vx_emacs_application_class, app_class); |
247 if (dpy == 0) | 244 if (dpy == 0) |
248 { | 245 { |
249 suppress_early_backtrace = 1; | 246 suppress_early_backtrace = 1; |
250 signal_simple_error ("X server not responding\n", display); | 247 signal_simple_error ("X server not responding\n", display); |
251 } | 248 } |
249 | |
250 if (NILP (Vdefault_x_device)) | |
251 Vdefault_x_device = device; | |
252 | 252 |
253 #ifdef MULE | 253 #ifdef MULE |
254 { | 254 { |
255 /* Read in locale-specific resources from | 255 /* Read in locale-specific resources from |
256 data-directory/app-defaults/$LANG/emacs-application-class. | 256 data-directory/app-defaults/$LANG/emacs-application-class. |