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

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.241 emacs/src/w32fns.c:1.242
*** emacs/src/w32fns.c:1.241    Tue Sep  7 21:48:37 2004
--- emacs/src/w32fns.c  Sat Oct 16 23:02:25 2004
***************
*** 5370,5376 ****
            setup_coding_system
              (Fcheck_coding_system (Vlocale_coding_system), &coding);
          coding.src_multibyte = 1;
!         coding.dst_multibyte = 1;
          /* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
             encode_coding_iso2022 trying to dereference a null pointer.  */
          coding.composing = COMPOSITION_DISABLED;
--- 5370,5376 ----
            setup_coding_system
              (Fcheck_coding_system (Vlocale_coding_system), &coding);
          coding.src_multibyte = 1;
!         coding.dst_multibyte = 0;
          /* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
             encode_coding_iso2022 trying to dereference a null pointer.  */
          coding.composing = COMPOSITION_DISABLED;
***************
*** 5607,5618 ****
      char * fontname;
      char * pattern;
  {
!   char *regex = alloca (strlen (pattern) * 2 + 3);
!   char *font_name_copy = alloca (strlen (fontname) + 1);
    char *ptr;
  
!   /* Copy fontname so we can modify it during comparison.  */
!   strcpy (font_name_copy, fontname);
  
    ptr = regex;
    *ptr++ = '^';
--- 5607,5620 ----
      char * fontname;
      char * pattern;
  {
!   char *font_name_copy;
    char *ptr;
+   Lisp_Object encoded_font_name;
+   char *regex = alloca (strlen (pattern) * 2 + 3);
  
!   /* Convert fontname to unibyte for match.  */
!   encoded_font_name = string_make_unibyte (build_string (fontname));
!   font_name_copy = SDATA (encoded_font_name);
  
    ptr = regex;
    *ptr++ = '^';