(lisp_data_to_selection_data): Always set selection

type as string if x_encode_text returns streingp non-NULL.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/xselect.c b/src/xselect.c
index a92943c538..28b3338757 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1766,15 +1766,7 @@ lisp_data_to_selection_data (display, obj,
 				 (int *) size_ret, &stringp);
       *nofree_ret = (*data_ret == XSTRING (obj)->data);
       if (NILP (type))
-	{
-	  if (stringp && *nofree_ret)
-	    type = QSTRING;
-	  else if (EQ (Vnext_selection_coding_system,
-		       Qcompound_text_with_extensions))
-	    type = QCOMPOUND_TEXT;
-	  else
-	    type = (stringp ? QSTRING : QCOMPOUND_TEXT);
-	}
+	type = (stringp ? QSTRING : QCOMPOUND_TEXT);
       Vlast_coding_system_used = (*nofree_ret
 				  ? Qraw_text
 				  : Vnext_selection_coding_system);