(x_encode_text): Return stringp non-NULL if coding_system

is Qcompound_text_with_extensions.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f7c516c693cb1686d371fcf3b0f03763f19e792..9be130c46f0644bec94e81b4ecf55221ac646926 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2002-05-31  Eli Zaretskii  <eliz@is.elta.co.il>
 
+       * 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  <rms@gnu.org>

diff --git a/src/xfns.c b/src/xfns.c
index 1e2cd65863a6d330f583b387056a07302b1a2a10..cd3dcdd54fd89a626cc1a4543de3de716e57fca0 100644 (file)
--- 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;
 }