aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-10-26 04:58:18 +0000
committerRichard M. Stallman1994-10-26 04:58:18 +0000
commita7b24d468945f27150b2543dc9e442dd479409a2 (patch)
tree1aa12d56347805cac75f5264b6fc14374575d84b /src
parent8400b9ed37a756f20200e95d775b4f09fb921611 (diff)
downloademacs-a7b24d468945f27150b2543dc9e442dd479409a2.tar.gz
emacs-a7b24d468945f27150b2543dc9e442dd479409a2.zip
(x_own_selection, x_get_foreign_selection): Change calls
to x_catch_errors and friends.
Diffstat (limited to 'src')
-rw-r--r--src/xselect.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 48ddc783517..c02d70c35d8 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -244,10 +244,10 @@ x_own_selection (selection_name, selection_value)
244 selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name); 244 selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name);
245 245
246 BLOCK_INPUT; 246 BLOCK_INPUT;
247 x_catch_errors (selected_frame); 247 x_catch_errors (display);
248 XSetSelectionOwner (display, selection_atom, selecting_window, time); 248 XSetSelectionOwner (display, selection_atom, selecting_window, time);
249 x_check_errors (selected_frame, "Can't set selection: %s"); 249 x_check_errors (display, "Can't set selection: %s");
250 x_uncatch_errors (selected_frame); 250 x_uncatch_errors (display);
251 UNBLOCK_INPUT; 251 UNBLOCK_INPUT;
252 252
253 /* Now update the local cache */ 253 /* Now update the local cache */
@@ -1049,7 +1049,7 @@ x_get_foreign_selection (selection_symbol, target_type)
1049 type_atom = symbol_to_x_atom (dpyinfo, display, target_type); 1049 type_atom = symbol_to_x_atom (dpyinfo, display, target_type);
1050 1050
1051 BLOCK_INPUT; 1051 BLOCK_INPUT;
1052 x_catch_errors (selected_frame); 1052 x_catch_errors (display);
1053 XConvertSelection (display, selection_atom, type_atom, target_property, 1053 XConvertSelection (display, selection_atom, type_atom, target_property,
1054 requestor_window, requestor_time); 1054 requestor_window, requestor_time);
1055 XFlush (display); 1055 XFlush (display);
@@ -1067,8 +1067,8 @@ x_get_foreign_selection (selection_symbol, target_type)
1067 wait_reading_process_input (secs, usecs, reading_selection_reply, 0); 1067 wait_reading_process_input (secs, usecs, reading_selection_reply, 0);
1068 1068
1069 BLOCK_INPUT; 1069 BLOCK_INPUT;
1070 x_check_errors (selected_frame, "Cannot get selection: %s"); 1070 x_check_errors (display, "Cannot get selection: %s");
1071 x_uncatch_errors (selected_frame); 1071 x_uncatch_errors (display);
1072 x_stop_queuing_selection_requests (selected_frame); 1072 x_stop_queuing_selection_requests (selected_frame);
1073 UNBLOCK_INPUT; 1073 UNBLOCK_INPUT;
1074 1074