comparison src/xselect.c @ 85372:f7d19cfed7da

* xselect.c (x_own_selection, x_handle_selection_clear) (x_clear_frame_selections): * w32menu.c (list_of_panes, list_of_items): * w32fns.c (w32_color_map_lookup, Fx_create_frame, Fx_display_list): * textprop.c (validate_plist, interval_has_all_properties) (interval_has_some_properties, interval_has_some_properties_list) (add_properties, text_property_list): * process.c (Fget_buffer_process, list_processes_1, status_notify): * minibuf.c (Fassoc_string): * macselect.c (x_own_selection, x_clear_frame_selections) (Fx_disown_selection_internal): * keymap.c (Fcommand_remapping, where_is_internal, describe_map_tree): Use CONSP rather than !NILP and XC[AD]R rather than Fc[ad]r.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 17 Oct 2007 23:43:52 +0000
parents 1f5d5f7ff8c2
children 762d3b6b64a3 1251cabc40b7
comparison
equal deleted inserted replaced
85371:8f7b544a943f 85372:f7d19cfed7da
440 Perhaps we should destructively modify it instead. 440 Perhaps we should destructively modify it instead.
441 Don't use Fdelq as that may QUIT. */ 441 Don't use Fdelq as that may QUIT. */
442 if (!NILP (prev_value)) 442 if (!NILP (prev_value))
443 { 443 {
444 Lisp_Object rest; /* we know it's not the CAR, so it's easy. */ 444 Lisp_Object rest; /* we know it's not the CAR, so it's easy. */
445 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest)) 445 for (rest = Vselection_alist; CONSP (rest); rest = XCDR (rest))
446 if (EQ (prev_value, Fcar (XCDR (rest)))) 446 if (EQ (prev_value, Fcar (XCDR (rest))))
447 { 447 {
448 XSETCDR (rest, Fcdr (XCDR (rest))); 448 XSETCDR (rest, Fcdr (XCDR (rest)));
449 break; 449 break;
450 } 450 }
1070 if (EQ (local_selection_data, Fcar (Vselection_alist))) 1070 if (EQ (local_selection_data, Fcar (Vselection_alist)))
1071 Vselection_alist = Fcdr (Vselection_alist); 1071 Vselection_alist = Fcdr (Vselection_alist);
1072 else 1072 else
1073 { 1073 {
1074 Lisp_Object rest; 1074 Lisp_Object rest;
1075 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest)) 1075 for (rest = Vselection_alist; CONSP (rest); rest = XCDR (rest))
1076 if (EQ (local_selection_data, Fcar (XCDR (rest)))) 1076 if (EQ (local_selection_data, Fcar (XCDR (rest))))
1077 { 1077 {
1078 XSETCDR (rest, Fcdr (XCDR (rest))); 1078 XSETCDR (rest, Fcdr (XCDR (rest)));
1079 break; 1079 break;
1080 } 1080 }
1151 1151
1152 Vselection_alist = Fcdr (Vselection_alist); 1152 Vselection_alist = Fcdr (Vselection_alist);
1153 } 1153 }
1154 1154
1155 /* Delete elements after the beginning of Vselection_alist. */ 1155 /* Delete elements after the beginning of Vselection_alist. */
1156 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest)) 1156 for (rest = Vselection_alist; CONSP (rest); rest = XCDR (rest))
1157 if (EQ (frame, Fcar (Fcdr (Fcdr (Fcdr (Fcar (XCDR (rest)))))))) 1157 if (EQ (frame, Fcar (Fcdr (Fcdr (Fcdr (Fcar (XCDR (rest))))))))
1158 { 1158 {
1159 /* Let random Lisp code notice that the selection has been stolen. */ 1159 /* Let random Lisp code notice that the selection has been stolen. */
1160 Lisp_Object hooks, selection_symbol; 1160 Lisp_Object hooks, selection_symbol;
1161 1161