Mercurial > emacs
changeset 23113:4d3c7b5b4fae
(selection_data_to_lisp_data): Code-convert selections
regardless of enable-multibyte-characters.
(lisp_data_to_selection_data): Likewise for decoding.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 26 Aug 1998 21:15:23 +0000 |
| parents | 81052242dbce |
| children | e51b304d8195 |
| files | src/xselect.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xselect.c Wed Aug 26 21:14:25 1998 +0000 +++ b/src/xselect.c Wed Aug 26 21:15:23 1998 +0000 @@ -1473,7 +1473,13 @@ Lisp_Object str; int require_encoding = 0; - if (! NILP (buffer_defaults.enable_multibyte_characters)) + if ( +#if 1 + 1 +#else + ! NILP (buffer_defaults.enable_multibyte_characters) +#endif + ) { /* If TYPE is `TEXT' or `COMPOUND_TEXT', we should decode DATA to Emacs internal format because DATA may be encoded @@ -1628,7 +1634,8 @@ *data_ret = XSTRING (obj)->data; bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); num = ((*size_ret <= 1 /* Check the possibility of short cut. */ - || NILP (buffer_defaults.enable_multibyte_characters)) + || !STRING_MULTIBYTE (obj) + || *size_ret == XSTRING (obj)->size) ? 0 : find_charset_in_str (*data_ret, *size_ret, charsets, Qnil, 1));