comparison src/xselect.c @ 83545:034f67f59091

Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-479 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-480 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-481 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-482 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-483 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-484 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-485 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-153 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-155 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 12:25:18 +0000
parents 694bbb62a75d 842c20ea5853
children c71725faff1a
comparison
equal deleted inserted replaced
83544:58cf725f5330 83545:034f67f59091
962 unsigned int size; 962 unsigned int size;
963 int format; 963 int format;
964 Atom type; 964 Atom type;
965 int nofree; 965 int nofree;
966 966
967 if (CONSP (converted_selection) && NILP (XCDR (converted_selection)))
968 {
969 x_decline_selection_request (event);
970 goto DONE2;
971 }
972
967 lisp_data_to_selection_data (SELECTION_EVENT_DISPLAY (event), 973 lisp_data_to_selection_data (SELECTION_EVENT_DISPLAY (event),
968 converted_selection, 974 converted_selection,
969 &data, &type, &size, &format, &nofree); 975 &data, &type, &size, &format, &nofree);
970 976
971 x_reply_selection_request (event, format, data, size, type); 977 x_reply_selection_request (event, format, data, size, type);
977 /* Use xfree, not XFree, because lisp_data_to_selection_data 983 /* Use xfree, not XFree, because lisp_data_to_selection_data
978 calls xmalloc itself. */ 984 calls xmalloc itself. */
979 if (!nofree) 985 if (!nofree)
980 xfree (data); 986 xfree (data);
981 } 987 }
988
989 DONE2:
982 unbind_to (count, Qnil); 990 unbind_to (count, Qnil);
983 991
984 DONE: 992 DONE:
985 993
986 /* Let random lisp code notice that the selection has been asked for. */ 994 /* Let random lisp code notice that the selection has been asked for. */