diff options
| author | Miles Bader <miles@gnu.org> | 2004-10-22 10:13:52 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-10-22 10:13:52 +0000 |
| commit | 5ea24f9468ea9fb01253a98343a67fdb74d1817e (patch) | |
| tree | 434ee6dc5f051d6deaf0c357b97b656d16e4ed12 /src/w32fns.c | |
| parent | 56c68b971d6f7665dd035df1ff302d794c0f294a (diff) | |
| parent | d5ddd795bdab373fe62ccfd099c270fd97da0964 (diff) | |
| download | emacs-5ea24f9468ea9fb01253a98343a67fdb74d1817e.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
Update from CVS: Add lisp/legacy-gnus-agent.el
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
Update from CVS
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 2b613931a9c..e5a1ca00cc3 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5667,12 +5667,14 @@ w32_font_match (fontname, pattern) char * fontname; char * pattern; { - char *regex = alloca (strlen (pattern) * 2 + 3); - char *font_name_copy = alloca (strlen (fontname) + 1); + char *font_name_copy; char *ptr; + Lisp_Object encoded_font_name; + char *regex = alloca (strlen (pattern) * 2 + 3); - /* Copy fontname so we can modify it during comparison. */ - strcpy (font_name_copy, fontname); + /* 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++ = '^'; |