From: Kenichi Handa <handa@m17n.org>
Date: Mon, 6 Nov 2000 12:35:44 +0000 (+0000)
Subject: Include composite.h.
X-Git-Tag: emacs-pretest-21.0.90~276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0caef0ecf7589c2c49c5f74f8669492b4d6f6862;p=emacs.git

Include composite.h.
(selection_data_to_lisp_data): Call compose_chars_in_text on STR.
---

diff --git a/src/xselect.c b/src/xselect.c
index ac260160781..289d01e03b9 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "coding.h"
 #include "process.h"
+#include "composite.h"
 
 #define CUT_BUFFER_SUPPORT
 
@@ -1551,6 +1552,7 @@ selection_data_to_lisp_data (display, data, size, type, format)
 	  xfree (buf);
 	  Vlast_coding_system_used = coding.symbol;
 	}
+      compose_chars_in_text (0, XSTRING (str)->size, str);
       return str;
     }
   /* Convert a single atom to a Lisp_Symbol.  Convert a set of atoms to