Mercurial > emacs
changeset 73427:842c20ea5853
* xselect.c (x_handle_selection_request): If the converted_selection
is NIL or XCDR (converted_selection) is NIL, decline the request.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 19 Oct 2006 07:17:42 +0000 |
| parents | 50ad827e063d |
| children | c78fdfe68241 |
| files | src/ChangeLog src/xselect.c |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Oct 19 07:16:27 2006 +0000 +++ b/src/ChangeLog Thu Oct 19 07:17:42 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xselect.c (x_handle_selection_request): If the converted_selection + is NIL or XCDR (converted_selection) is NIL, decline the request. + 2006-10-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * gtkutil.c (get_utf8_string): Remove warnings with casts.
--- a/src/xselect.c Thu Oct 19 07:16:27 2006 +0000 +++ b/src/xselect.c Thu Oct 19 07:17:42 2006 +0000 @@ -956,6 +956,12 @@ Atom type; int nofree; + if (CONSP (converted_selection) && NILP (XCDR (converted_selection))) + { + x_decline_selection_request (event); + goto DONE2; + } + lisp_data_to_selection_data (SELECTION_EVENT_DISPLAY (event), converted_selection, &data, &type, &size, &format, &nofree); @@ -971,6 +977,8 @@ if (!nofree) xfree (data); } + + DONE2: unbind_to (count, Qnil); DONE: