(lisp_data_to_selection_data): Always set selection

type as string if x_encode_text returns streingp non-NULL.

diff --git a/src/xselect.c b/src/xselect.c
index a92943c5381fcb3cf1e650c53b022517107efcf2..28b3338757ee5354af8a2f469974e11890902337 100644 (file)
--- 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);