Mercurial > emacs

comparison src/xterm.c @ 81276:343ad02b4c24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_term_init): Use empty_unibyte_string.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 08 Jun 2007 20:06:31 +0000
parents e0264dddb1ca
children ae42317dff79 cc587bfd19ca e9f94688a064
comparison
equal deleted inserted replaced
81275:635cfa62c941 81276:343ad02b4c24
8355 x_catch_errors (dpy); 8355 x_catch_errors (dpy);
8356 rc = XGetWindowProperty (dpy, target_window, 8356 rc = XGetWindowProperty (dpy, target_window,
8357 prop_atom, 0, max_len, False, target_type, 8357 prop_atom, 0, max_len, False, target_type,
8358 &actual_type, &actual_format, &actual_size, 8358 &actual_type, &actual_format, &actual_size,
8359 &bytes_remaining, &tmp_data); 8359 &bytes_remaining, &tmp_data);
8360 8360
8361 if (rc != Success || actual_type != XA_WINDOW || x_had_errors_p (dpy)) 8361 if (rc != Success || actual_type != XA_WINDOW || x_had_errors_p (dpy))
8362 { 8362 {
8363 if (tmp_data) XFree (tmp_data); 8363 if (tmp_data) XFree (tmp_data);
8364 x_uncatch_errors (); 8364 x_uncatch_errors ();
8365 UNBLOCK_INPUT; 8365 UNBLOCK_INPUT;
8410 } 8410 }
8411 8411
8412 rc = 0; 8412 rc = 0;
8413 want_atom = XInternAtom (dpy, atomname, False); 8413 want_atom = XInternAtom (dpy, atomname, False);
8414 8414
8415 for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i) 8415 for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i)
8416 rc = dpyinfo->net_supported_atoms[i] == want_atom; 8416 rc = dpyinfo->net_supported_atoms[i] == want_atom;
8417 8417
8418 x_uncatch_errors (); 8418 x_uncatch_errors ();
8419 UNBLOCK_INPUT; 8419 UNBLOCK_INPUT;
8420 8420
10647 { 10647 {
10648 char *vendor = ServerVendor (dpy); 10648 char *vendor = ServerVendor (dpy);
10649 UNBLOCK_INPUT; 10649 UNBLOCK_INPUT;
10650 dpyinfo->kboard->Vsystem_key_alist 10650 dpyinfo->kboard->Vsystem_key_alist
10651 = call1 (Qvendor_specific_keysyms, 10651 = call1 (Qvendor_specific_keysyms,
10652 build_string (vendor ? vendor : "")); 10652 vendor ? build_string (vendor) : empty_unibyte_string);
10653 BLOCK_INPUT; 10653 BLOCK_INPUT;
10654 } 10654 }
10655 10655
10656 dpyinfo->kboard->next_kboard = all_kboards; 10656 dpyinfo->kboard->next_kboard = all_kboards;
10657 all_kboards = dpyinfo->kboard; 10657 all_kboards = dpyinfo->kboard;