[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32fns.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32fns.c [lexbind] |
Date: |
Mon, 25 Oct 2004 00:42:04 -0400 |
Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.173.2.17 emacs/src/w32fns.c:1.173.2.18
*** emacs/src/w32fns.c:1.173.2.17 Thu Sep 16 00:12:25 2004
--- emacs/src/w32fns.c Mon Oct 25 04:22:26 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++ = '^';
- [Emacs-diffs] Changes to emacs/src/w32fns.c [lexbind],
Miles Bader <=