comparison src/select.c @ 5468:a9094f28f9a9

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Wed, 19 Jan 2011 22:35:23 +0100
parents 308d34e9f07d 8608eadee6ba
children 56144c8593a8
comparison
equal deleted inserted replaced
5457:4ed2dedf36a1 5468:a9094f28f9a9
179 Vselection_alist); 179 Vselection_alist);
180 180
181 if (!NILP (local_selection_data)) 181 if (!NILP (local_selection_data))
182 { 182 {
183 owned_p = 1; 183 owned_p = 1;
184 /* Don't use Fdelq() as that may QUIT;. */ 184 Vselection_alist
185 if (EQ (local_selection_data, Fcar (Vselection_alist))) 185 = delq_no_quit (local_selection_data, Vselection_alist);
186 Vselection_alist = Fcdr (Vselection_alist);
187 else
188 {
189 Lisp_Object rest;
190 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest))
191 if (EQ (local_selection_data, Fcar (XCDR (rest))))
192 {
193 XCDR (rest) = Fcdr (XCDR (rest));
194 break;
195 }
196 }
197 } 186 }
198 } 187 }
199 else 188 else
200 { 189 {
201 /* Look for a previous value */ 190 /* Look for a previous value */
408 Vselection_alist); 397 Vselection_alist);
409 398
410 /* Well, we already believe that we don't own it, so that's just fine. */ 399 /* Well, we already believe that we don't own it, so that's just fine. */
411 if (NILP (local_selection_data)) return; 400 if (NILP (local_selection_data)) return;
412 401
413 /* Otherwise, we're really honest and truly being told to drop it. 402 /* Otherwise, we're really honest and truly being told to drop it. */
414 Don't use Fdelq() as that may QUIT;. 403 Vselection_alist = delq_no_quit (local_selection_data, Vselection_alist);
415 */
416 if (EQ (local_selection_data, Fcar (Vselection_alist)))
417 Vselection_alist = Fcdr (Vselection_alist);
418 else
419 {
420 Lisp_Object rest;
421 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest))
422 if (EQ (local_selection_data, Fcar (XCDR (rest))))
423 {
424 XCDR (rest) = Fcdr (XCDR (rest));
425 break;
426 }
427 }
428 404
429 /* Let random lisp code notice that the selection has been stolen. 405 /* Let random lisp code notice that the selection has been stolen.
430 */ 406 */
431 { 407 {
432 Lisp_Object rest; 408 Lisp_Object rest;