Mercurial > emacs
comparison src/xselect.c @ 97575:f188167016d0
(x_get_foreign_selection): Return nil if desired selection could not
be obtained, instead of signalling an error.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 20 Aug 2008 22:09:56 +0000 |
parents | 840bd675fd85 |
children | 69913c2322d0 |
comparison
equal
deleted
inserted
replaced
97574:6271a23dda53 | 97575:f188167016d0 |
---|---|
1469 UNBLOCK_INPUT; | 1469 UNBLOCK_INPUT; |
1470 | 1470 |
1471 if (NILP (XCAR (reading_selection_reply))) | 1471 if (NILP (XCAR (reading_selection_reply))) |
1472 error ("Timed out waiting for reply from selection owner"); | 1472 error ("Timed out waiting for reply from selection owner"); |
1473 if (EQ (XCAR (reading_selection_reply), Qlambda)) | 1473 if (EQ (XCAR (reading_selection_reply), Qlambda)) |
1474 error ("No `%s' selection", SDATA (SYMBOL_NAME (selection_symbol))); | 1474 return Qnil; |
1475 | 1475 |
1476 /* Otherwise, the selection is waiting for us on the requested property. */ | 1476 /* Otherwise, the selection is waiting for us on the requested property. */ |
1477 return | 1477 return |
1478 x_get_window_property_as_lisp_data (display, requestor_window, | 1478 x_get_window_property_as_lisp_data (display, requestor_window, |
1479 target_property, target_type, | 1479 target_property, target_type, |