From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 31 May 2002 17:42:32 +0000 (+0000)
Subject: (lisp_data_to_selection_data): Always set selection
X-Git-Tag: ttn-vms-21-2-B4~14800
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f326600bb8c4e888ae3dea678c8324c3f5addea4;p=emacs.git

(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 a92943c5381..28b3338757e 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);