comparison src/device-x.c @ 6:27bc7f280385 r19-15b4

Import from CVS: tag r19-15b4
author cvs
date Mon, 13 Aug 2007 08:47:15 +0200
parents ac2d302a0011
children 9ee227acff29
comparison
equal deleted inserted replaced
5:49b78a777eb4 6:27bc7f280385
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 string_length (XSTRING (Vx_emacs_application_class)) > 0) 230 string_length (XSTRING (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 if (NILP (DEVICE_NAME (d))) 253 if (NILP (DEVICE_NAME (d)))
254 DEVICE_NAME (d) = display; 254 DEVICE_NAME (d) = display;
255 255
256 /* We're going to modify the string in-place, so be a nice XEmacs */ 256 /* We're going to modify the string in-place, so be a nice XEmacs */