diff options
| author | Joakim Verona | 2011-12-28 11:34:15 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-12-28 11:34:15 +0100 |
| commit | 2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f (patch) | |
| tree | 034e65ef002631d0aba8fc1a41e9984fc557e630 /src/xselect.c | |
| parent | bb29f044aa967831cd664c54eba0de0c701436ce (diff) | |
| parent | d23ab8e8726ecb7e3554644857b4a58e5f7408f1 (diff) | |
| download | emacs-2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f.tar.gz emacs-2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f.zip | |
upstream
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xselect.c b/src/xselect.c index 4bfab4143cc..5e5e6a098b6 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -516,7 +516,7 @@ static struct selection_data *converted_selections; | |||
| 516 | static Atom conversion_fail_tag; | 516 | static Atom conversion_fail_tag; |
| 517 | 517 | ||
| 518 | /* Used as an unwind-protect clause so that, if a selection-converter signals | 518 | /* Used as an unwind-protect clause so that, if a selection-converter signals |
| 519 | an error, we tell the requester that we were unable to do what they wanted | 519 | an error, we tell the requestor that we were unable to do what they wanted |
| 520 | before we throw to top-level or go into the debugger or whatever. */ | 520 | before we throw to top-level or go into the debugger or whatever. */ |
| 521 | 521 | ||
| 522 | static Lisp_Object | 522 | static Lisp_Object |
| @@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 693 | bytes_remaining = cs->size; | 693 | bytes_remaining = cs->size; |
| 694 | bytes_remaining *= format_bytes; | 694 | bytes_remaining *= format_bytes; |
| 695 | 695 | ||
| 696 | /* Wait for the requester to ack by deleting the property. | 696 | /* Wait for the requestor to ack by deleting the property. |
| 697 | This can run Lisp code (process handlers) or signal. */ | 697 | This can run Lisp code (process handlers) or signal. */ |
| 698 | if (! had_errors) | 698 | if (! had_errors) |
| 699 | { | 699 | { |
| @@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 732 | 732 | ||
| 733 | if (had_errors) break; | 733 | if (had_errors) break; |
| 734 | 734 | ||
| 735 | /* Wait for the requester to ack this chunk by deleting | 735 | /* Wait for the requestor to ack this chunk by deleting |
| 736 | the property. This can run Lisp code or signal. */ | 736 | the property. This can run Lisp code or signal. */ |
| 737 | TRACE1 ("Waiting for increment ACK (deletion of %s)", | 737 | TRACE1 ("Waiting for increment ACK (deletion of %s)", |
| 738 | XGetAtomName (display, cs->property)); | 738 | XGetAtomName (display, cs->property)); |
| @@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 740 | } | 740 | } |
| 741 | 741 | ||
| 742 | /* Now write a zero-length chunk to the property to tell the | 742 | /* Now write a zero-length chunk to the property to tell the |
| 743 | requester that we're done. */ | 743 | requestor that we're done. */ |
| 744 | BLOCK_INPUT; | 744 | BLOCK_INPUT; |
| 745 | if (! waiting_for_other_props_on_window (display, window)) | 745 | if (! waiting_for_other_props_on_window (display, window)) |
| 746 | XSelectInput (display, window, 0L); | 746 | XSelectInput (display, window, 0L); |
| @@ -757,7 +757,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 757 | /* The window we're communicating with may have been deleted | 757 | /* The window we're communicating with may have been deleted |
| 758 | in the meantime (that's a real situation from a bug report). | 758 | in the meantime (that's a real situation from a bug report). |
| 759 | In this case, there may be events in the event queue still | 759 | In this case, there may be events in the event queue still |
| 760 | refering to the deleted window, and we'll get a BadWindow error | 760 | referring to the deleted window, and we'll get a BadWindow error |
| 761 | in XTread_socket when processing the events. I don't have | 761 | in XTread_socket when processing the events. I don't have |
| 762 | an idea how to fix that. gerd, 2001-01-98. */ | 762 | an idea how to fix that. gerd, 2001-01-98. */ |
| 763 | /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are | 763 | /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are |