diff options
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xselect.c b/src/xselect.c index 6a80eddc82c..d9f7d9c29c7 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -654,7 +654,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 654 | if (cs->wait_object) | 654 | if (cs->wait_object) |
| 655 | { | 655 | { |
| 656 | int format_bytes = cs->format / 8; | 656 | int format_bytes = cs->format / 8; |
| 657 | int had_errors = x_had_errors_p (display); | 657 | bool had_errors_p = x_had_errors_p (display); |
| 658 | unblock_input (); | 658 | unblock_input (); |
| 659 | 659 | ||
| 660 | bytes_remaining = cs->size; | 660 | bytes_remaining = cs->size; |
| @@ -662,7 +662,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 662 | 662 | ||
| 663 | /* Wait for the requestor to ack by deleting the property. | 663 | /* Wait for the requestor to ack by deleting the property. |
| 664 | This can run Lisp code (process handlers) or signal. */ | 664 | This can run Lisp code (process handlers) or signal. */ |
| 665 | if (! had_errors) | 665 | if (! had_errors_p) |
| 666 | { | 666 | { |
| 667 | TRACE1 ("Waiting for ACK (deletion of %s)", | 667 | TRACE1 ("Waiting for ACK (deletion of %s)", |
| 668 | XGetAtomName (display, cs->property)); | 668 | XGetAtomName (display, cs->property)); |
| @@ -694,10 +694,10 @@ x_reply_selection_request (struct input_event *event, | |||
| 694 | cs->data += i * ((cs->format == 32) ? sizeof (long) | 694 | cs->data += i * ((cs->format == 32) ? sizeof (long) |
| 695 | : format_bytes); | 695 | : format_bytes); |
| 696 | XFlush (display); | 696 | XFlush (display); |
| 697 | had_errors = x_had_errors_p (display); | 697 | had_errors_p = x_had_errors_p (display); |
| 698 | unblock_input (); | 698 | unblock_input (); |
| 699 | 699 | ||
| 700 | if (had_errors) break; | 700 | if (had_errors_p) break; |
| 701 | 701 | ||
| 702 | /* Wait for the requestor to ack this chunk by deleting | 702 | /* Wait for the requestor to ack this chunk by deleting |
| 703 | the property. This can run Lisp code or signal. */ | 703 | the property. This can run Lisp code or signal. */ |
| @@ -2427,17 +2427,17 @@ If the value is 0 or the atom is not known, return the empty string. */) | |||
| 2427 | Lisp_Object ret = Qnil; | 2427 | Lisp_Object ret = Qnil; |
| 2428 | Display *dpy = FRAME_X_DISPLAY (f); | 2428 | Display *dpy = FRAME_X_DISPLAY (f); |
| 2429 | Atom atom; | 2429 | Atom atom; |
| 2430 | int had_errors; | 2430 | bool had_errors_p; |
| 2431 | 2431 | ||
| 2432 | CONS_TO_INTEGER (value, Atom, atom); | 2432 | CONS_TO_INTEGER (value, Atom, atom); |
| 2433 | 2433 | ||
| 2434 | block_input (); | 2434 | block_input (); |
| 2435 | x_catch_errors (dpy); | 2435 | x_catch_errors (dpy); |
| 2436 | name = atom ? XGetAtomName (dpy, atom) : empty; | 2436 | name = atom ? XGetAtomName (dpy, atom) : empty; |
| 2437 | had_errors = x_had_errors_p (dpy); | 2437 | had_errors_p = x_had_errors_p (dpy); |
| 2438 | x_uncatch_errors (); | 2438 | x_uncatch_errors (); |
| 2439 | 2439 | ||
| 2440 | if (!had_errors) | 2440 | if (!had_errors_p) |
| 2441 | ret = build_string (name); | 2441 | ret = build_string (name); |
| 2442 | 2442 | ||
| 2443 | if (atom && name) XFree (name); | 2443 | if (atom && name) XFree (name); |