Mercurial > emacs

comparison src/xterm.c @ 83632:cc587bfd19ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
author Miles Bader <miles@gnu.org>
date Mon, 11 Jun 2007 01:00:07 +0000
parents 422451dd396a 343ad02b4c24
children fd5b4a865d1d
comparison
equal deleted inserted replaced
83631:7d63b897231b 83632:cc587bfd19ca
8395 x_catch_errors (dpy); 8395 x_catch_errors (dpy);
8396 rc = XGetWindowProperty (dpy, target_window, 8396 rc = XGetWindowProperty (dpy, target_window,
8397 prop_atom, 0, max_len, False, target_type, 8397 prop_atom, 0, max_len, False, target_type,
8398 &actual_type, &actual_format, &actual_size, 8398 &actual_type, &actual_format, &actual_size,
8399 &bytes_remaining, &tmp_data); 8399 &bytes_remaining, &tmp_data);
8400 8400
8401 if (rc != Success || actual_type != XA_WINDOW || x_had_errors_p (dpy)) 8401 if (rc != Success || actual_type != XA_WINDOW || x_had_errors_p (dpy))
8402 { 8402 {
8403 if (tmp_data) XFree (tmp_data); 8403 if (tmp_data) XFree (tmp_data);
8404 x_uncatch_errors (); 8404 x_uncatch_errors ();
8405 UNBLOCK_INPUT; 8405 UNBLOCK_INPUT;
8450 } 8450 }
8451 8451
8452 rc = 0; 8452 rc = 0;
8453 want_atom = XInternAtom (dpy, atomname, False); 8453 want_atom = XInternAtom (dpy, atomname, False);
8454 8454
8455 for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i) 8455 for (i = 0; rc == 0 && i < dpyinfo->nr_net_supported_atoms; ++i)
8456 rc = dpyinfo->net_supported_atoms[i] == want_atom; 8456 rc = dpyinfo->net_supported_atoms[i] == want_atom;
8457 8457
8458 x_uncatch_errors (); 8458 x_uncatch_errors ();
8459 UNBLOCK_INPUT; 8459 UNBLOCK_INPUT;
8460 8460
10697 { 10697 {
10698 char *vendor = ServerVendor (dpy); 10698 char *vendor = ServerVendor (dpy);
10699 UNBLOCK_INPUT; 10699 UNBLOCK_INPUT;
10700 terminal->kboard->Vsystem_key_alist 10700 terminal->kboard->Vsystem_key_alist
10701 = call1 (Qvendor_specific_keysyms, 10701 = call1 (Qvendor_specific_keysyms,
10702 build_string (vendor ? vendor : "")); 10702 vendor ? build_string (vendor) : empty_unibyte_string);
10703 BLOCK_INPUT; 10703 BLOCK_INPUT;
10704 } 10704 }
10705 10705
10706 terminal->kboard->next_kboard = all_kboards; 10706 terminal->kboard->next_kboard = all_kboards;
10707 all_kboards = terminal->kboard; 10707 all_kboards = terminal->kboard;