Mercurial > emacs

diff src/xselect.c @ 90645:7eeafaaa9eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 476-489) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 153-160) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
author Miles Bader <miles@gnu.org>
date Mon, 30 Oct 2006 08:54:41 +0000
parents 7f3f771c85fa 842c20ea5853
children dbe3f29e61d6
line wrap: on
line diff
--- a/src/xselect.c	Mon Oct 30 06:52:47 2006 +0000
+++ b/src/xselect.c	Mon Oct 30 08:54:41 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: