[Emacs-diffs] Changes to emacs/src/w32fns.c [emacs-unicode-2]

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.219.2.7 emacs/src/w32fns.c:1.219.2.8
*** emacs/src/w32fns.c:1.219.2.7        Fri Jul 23 04:30:43 2004
--- emacs/src/w32fns.c  Wed Sep  1 21:20:10 2004
***************
*** 5398,5416 ****
  
        if (fields > 0 && name[0] != '*')
          {
            setup_coding_system
              (Fcheck_coding_system (Vlocale_coding_system), &coding);
!         coding.src_multibyte = 1;
!         coding.dst_multibyte = 1;
!         coding.dst_bytes = strlen (name) * 2;
!         coding.destination = (unsigned char *) xmalloc (coding.dst_bytes);
          /* Disable composition/charset annotation.   */
          coding.common_flags &= ~CODING_ANNOTATION_MASK;
!         if (coding.type == coding_type_iso2022)
!           coding.flags |= CODING_FLAG_ISO_SAFE;
!           coding.mode |= CODING_MODE_LAST_BLOCK;
!           encode_coding_object (&coding, build_string (name), 0, 0,
!                               strlen (name), coding.dst_bytes, Qnil);
          if (coding.produced >= LF_FACESIZE)
            coding.produced = LF_FACESIZE - 1;
  
--- 5398,5414 ----
  
        if (fields > 0 && name[0] != '*')
          {
+         Lisp_Object string = build_string (name);
            setup_coding_system
              (Fcheck_coding_system (Vlocale_coding_system), &coding);
!           coding.mode |= (CODING_MODE_SAFE_ENCODING | CODING_MODE_LAST_BLOCK);
          /* Disable composition/charset annotation.   */
          coding.common_flags &= ~CODING_ANNOTATION_MASK;
!         coding.dst_bytes = SCHARS (string) * 2;
! 
!         coding.destination = (unsigned char *) xmalloc (coding.dst_bytes);
!           encode_coding_object (&coding, string, 0, 0,
!                               SCHARS (string), SBYTES (string), Qnil);
          if (coding.produced >= LF_FACESIZE)
            coding.produced = LF_FACESIZE - 1;