Mercurial > emacs
changeset 45602:09ecca30779f
(lisp_data_to_selection_data): Always set selection
type as string if x_encode_text returns streingp non-NULL.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 31 May 2002 17:42:32 +0000 |
| parents | b5294e5e5b92 |
| children | 97212b1039e9 |
| files | src/xselect.c |
| diffstat | 1 files changed, 1 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xselect.c Fri May 31 16:31:51 2002 +0000 +++ b/src/xselect.c Fri May 31 17:42:32 2002 +0000 @@ -1766,15 +1766,7 @@ (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);