1 files changed, 3 insertions, 0 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 09824ccbd6f..db99065747f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6685,6 +6685,9 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset)
   coding.src_multibyte = 0;
   coding.dst_multibyte = 1;
   coding.mode |= CODING_MODE_LAST_BLOCK;
+  /* We explicitely disable composition handling because selection
+     data should not contain any composition sequence.  */
+  coding.composing = COMPOSITION_DISABLED;
   bufsz = decoding_buffer_size (&coding, LF_FACESIZE);
 
   fontname = alloca(sizeof(*fontname) * bufsz);