diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xselect.c | 10 |
1 files changed, 1 insertions, 9 deletions
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, | |||
| 1766 | (int *) size_ret, &stringp); | 1766 | (int *) size_ret, &stringp); |
| 1767 | *nofree_ret = (*data_ret == XSTRING (obj)->data); | 1767 | *nofree_ret = (*data_ret == XSTRING (obj)->data); |
| 1768 | if (NILP (type)) | 1768 | if (NILP (type)) |
| 1769 | { | 1769 | type = (stringp ? QSTRING : QCOMPOUND_TEXT); |
| 1770 | if (stringp && *nofree_ret) | ||
| 1771 | type = QSTRING; | ||
| 1772 | else if (EQ (Vnext_selection_coding_system, | ||
| 1773 | Qcompound_text_with_extensions)) | ||
| 1774 | type = QCOMPOUND_TEXT; | ||
| 1775 | else | ||
| 1776 | type = (stringp ? QSTRING : QCOMPOUND_TEXT); | ||
| 1777 | } | ||
| 1778 | Vlast_coding_system_used = (*nofree_ret | 1770 | Vlast_coding_system_used = (*nofree_ret |
| 1779 | ? Qraw_text | 1771 | ? Qraw_text |
| 1780 | : Vnext_selection_coding_system); | 1772 | : Vnext_selection_coding_system); |