/[emacs]/emacs/src/w32fns.c
ViewVC logotype

Diff of /emacs/src/w32fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.241 by jasonr, Tue Sep 7 21:48:37 2004 UTC revision 1.242 by jasonr, Sat Oct 16 23:02:25 2004 UTC
# Line 5370  x_to_w32_font (lpxstr, lplogfont) Line 5370  x_to_w32_font (lpxstr, lplogfont)
5370            setup_coding_system            setup_coding_system
5371              (Fcheck_coding_system (Vlocale_coding_system), &coding);              (Fcheck_coding_system (Vlocale_coding_system), &coding);
5372            coding.src_multibyte = 1;            coding.src_multibyte = 1;
5373            coding.dst_multibyte = 1;            coding.dst_multibyte = 0;
5374            /* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in            /* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
5375               encode_coding_iso2022 trying to dereference a null pointer.  */               encode_coding_iso2022 trying to dereference a null pointer.  */
5376            coding.composing = COMPOSITION_DISABLED;            coding.composing = COMPOSITION_DISABLED;
# Line 5607  w32_font_match (fontname, pattern) Line 5607  w32_font_match (fontname, pattern)
5607      char * fontname;      char * fontname;
5608      char * pattern;      char * pattern;
5609  {  {
5610    char *regex = alloca (strlen (pattern) * 2 + 3);    char *font_name_copy;
   char *font_name_copy = alloca (strlen (fontname) + 1);  
5611    char *ptr;    char *ptr;
5612      Lisp_Object encoded_font_name;
5613      char *regex = alloca (strlen (pattern) * 2 + 3);
5614    
5615    /* Copy fontname so we can modify it during comparison.  */    /* Convert fontname to unibyte for match.  */
5616    strcpy (font_name_copy, fontname);    encoded_font_name = string_make_unibyte (build_string (fontname));
5617      font_name_copy = SDATA (encoded_font_name);
5618    
5619    ptr = regex;    ptr = regex;
5620    *ptr++ = '^';    *ptr++ = '^';

Legend:
Removed from v.1.241  
changed lines
  Added in v.1.242

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26