From: Eli Zaretskii Date: Fri, 31 May 2002 17:43:45 +0000 (+0000) Subject: (x_encode_text): Return stringp non-NULL if coding_system X-Git-Tag: ttn-vms-21-2-B4~14799 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43dc73f18fb590168face8211d9e434455e2df33;p=emacs.git (x_encode_text): Return stringp non-NULL if coding_system is Qcompound_text_with_extensions. --- diff --git a/src/ChangeLog b/src/ChangeLog index 7f7c516c693..9be130c46f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2002-05-31 Eli Zaretskii + * xfns.c (x_encode_text): Return stringp non-NULL if coding_system + is Qcompound_text_with_extensions. + + * xselect.c (lisp_data_to_selection_data): Always set selection + type as string if x_encode_text returns streingp non-NULL. + * s/netbsd.h: Include /usr/pkg in the run time shared library path. 2002-05-30 Richard M. Stallman diff --git a/src/xfns.c b/src/xfns.c index 1e2cd65863a..cd3dcdd54fd 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2387,6 +2387,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp) int bufsize; unsigned char *buf; struct coding_system coding; + extern Lisp_Object Qcompound_text_with_extensions; charset_info = find_charset_in_text (str, chars, bytes, NULL, Qnil); if (charset_info == 0) @@ -2418,7 +2419,9 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp) buf = (unsigned char *) xmalloc (bufsize); encode_coding (&coding, str, buf, bytes, bufsize); *text_bytes = coding.produced; - *stringp = (charset_info == 1 || !EQ (coding_system, Qcompound_text)); + *stringp = (charset_info == 1 + || (!EQ (coding_system, Qcompound_text) + && !EQ (coding_system, Qcompound_text_with_extensions))); return buf; }