aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorPaul Eggert2012-08-17 17:07:52 -0700
committerPaul Eggert2012-08-17 17:07:52 -0700
commit3f22b86fc7d9b66ff3e332b9a56350e93ddbd0aa (patch)
treecbdad3a66ebab38dba4f41ec3ad861252618b4fd /src/xselect.c
parent15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145 (diff)
downloademacs-3f22b86fc7d9b66ff3e332b9a56350e93ddbd0aa.tar.gz
emacs-3f22b86fc7d9b66ff3e332b9a56350e93ddbd0aa.zip
* termhooks.h (TSET): Remove.
Replace all uses with calls to new setter functions. Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. (TERMHOOKS_INLINE): New macro. (tset_charset_list, tset_selection_alist): New setter functions. * terminal.c (TERMHOOKS_INLINE): Define to EXTERN_INLINE, so that the corresponding functions are compiled into code. (tset_param_alist): New setter function. Fixes: debbugs:12215
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 664b5f92a15..463bd6e37b0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -353,8 +353,9 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
353 INTEGER_TO_CONS (timestamp), frame); 353 INTEGER_TO_CONS (timestamp), frame);
354 prev_value = LOCAL_SELECTION (selection_name, dpyinfo); 354 prev_value = LOCAL_SELECTION (selection_name, dpyinfo);
355 355
356 TSET (dpyinfo->terminal, Vselection_alist, 356 tset_selection_alist
357 Fcons (selection_data, dpyinfo->terminal->Vselection_alist)); 357 (dpyinfo->terminal,
358 Fcons (selection_data, dpyinfo->terminal->Vselection_alist));
358 359
359 /* If we already owned the selection, remove the old selection 360 /* If we already owned the selection, remove the old selection
360 data. Don't use Fdelq as that may QUIT. */ 361 data. Don't use Fdelq as that may QUIT. */
@@ -989,7 +990,7 @@ x_handle_selection_clear (struct input_event *event)
989 break; 990 break;
990 } 991 }
991 } 992 }
992 TSET (dpyinfo->terminal, Vselection_alist, Vselection_alist); 993 tset_selection_alist (dpyinfo->terminal, Vselection_alist);
993 994
994 /* Run the `x-lost-selection-functions' abnormal hook. */ 995 /* Run the `x-lost-selection-functions' abnormal hook. */
995 { 996 {
@@ -1039,7 +1040,7 @@ x_clear_frame_selections (FRAME_PTR f)
1039 args[1] = Fcar (Fcar (t->Vselection_alist)); 1040 args[1] = Fcar (Fcar (t->Vselection_alist));
1040 Frun_hook_with_args (2, args); 1041 Frun_hook_with_args (2, args);
1041 1042
1042 TSET (t, Vselection_alist, XCDR (t->Vselection_alist)); 1043 tset_selection_alist (t, XCDR (t->Vselection_alist));
1043 } 1044 }
1044 1045
1045 /* Delete elements after the beginning of Vselection_alist. */ 1046 /* Delete elements after the beginning of Vselection_alist. */