diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/xselect.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c index d2ab416176c..099b1670e4d 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -515,7 +515,7 @@ static struct selection_data *converted_selections; | |||
| 515 | static Atom conversion_fail_tag; | 515 | static Atom conversion_fail_tag; |
| 516 | 516 | ||
| 517 | /* Used as an unwind-protect clause so that, if a selection-converter signals | 517 | /* Used as an unwind-protect clause so that, if a selection-converter signals |
| 518 | an error, we tell the requester that we were unable to do what they wanted | 518 | an error, we tell the requestor that we were unable to do what they wanted |
| 519 | before we throw to top-level or go into the debugger or whatever. */ | 519 | before we throw to top-level or go into the debugger or whatever. */ |
| 520 | 520 | ||
| 521 | static Lisp_Object | 521 | static Lisp_Object |
| @@ -692,7 +692,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 692 | bytes_remaining = cs->size; | 692 | bytes_remaining = cs->size; |
| 693 | bytes_remaining *= format_bytes; | 693 | bytes_remaining *= format_bytes; |
| 694 | 694 | ||
| 695 | /* Wait for the requester to ack by deleting the property. | 695 | /* Wait for the requestor to ack by deleting the property. |
| 696 | This can run Lisp code (process handlers) or signal. */ | 696 | This can run Lisp code (process handlers) or signal. */ |
| 697 | if (! had_errors) | 697 | if (! had_errors) |
| 698 | { | 698 | { |
| @@ -731,7 +731,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 731 | 731 | ||
| 732 | if (had_errors) break; | 732 | if (had_errors) break; |
| 733 | 733 | ||
| 734 | /* Wait for the requester to ack this chunk by deleting | 734 | /* Wait for the requestor to ack this chunk by deleting |
| 735 | the property. This can run Lisp code or signal. */ | 735 | the property. This can run Lisp code or signal. */ |
| 736 | TRACE1 ("Waiting for increment ACK (deletion of %s)", | 736 | TRACE1 ("Waiting for increment ACK (deletion of %s)", |
| 737 | XGetAtomName (display, cs->property)); | 737 | XGetAtomName (display, cs->property)); |
| @@ -739,7 +739,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 739 | } | 739 | } |
| 740 | 740 | ||
| 741 | /* Now write a zero-length chunk to the property to tell the | 741 | /* Now write a zero-length chunk to the property to tell the |
| 742 | requester that we're done. */ | 742 | requestor that we're done. */ |
| 743 | BLOCK_INPUT; | 743 | BLOCK_INPUT; |
| 744 | if (! waiting_for_other_props_on_window (display, window)) | 744 | if (! waiting_for_other_props_on_window (display, window)) |
| 745 | XSelectInput (display, window, 0L); | 745 | XSelectInput (display, window, 0L); |